Merge commit 'smcv/force-uuids' into force-uuids
authorJoey Hess <joey@kodama.kitenet.net>
Sat, 12 Jul 2008 14:43:22 +0000 (10:43 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Sat, 12 Jul 2008 14:43:22 +0000 (10:43 -0400)
commit0fe87efc348643e30405f2d50c8498c971b99af4
tree022daf42e8750b7dd5e1eb7a3b4d7874530fed8d
parenta0f596b6ed4594011b07cf7af2d2d55aa78d8be1
parent9c6444bf681ec48e3832282906d1d2cfad586cb5
Merge commit 'smcv/force-uuids' into force-uuids