Merge commit 'smcv/master'
authorJoey Hess <joey@kodama.kitenet.net>
Mon, 21 Jul 2008 21:05:40 +0000 (17:05 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Mon, 21 Jul 2008 21:05:40 +0000 (17:05 -0400)
commitedfe8693814ef48426dc35fa76cdd145871fbc96
treefc144eee7be24a25aa9088e6fe91f941467ffc51
parent652beaf48c64d5dd10cb0e0702f1fb284c96177a
parent09a5cdbb3401cdcb17f3d2993912a8f0ea8d23b2
Merge commit 'smcv/master'