Merge commit 'smcv/updated'
authorJoey Hess <joey@gnu.kitenet.net>
Tue, 27 Jan 2009 01:05:36 +0000 (20:05 -0500)
committerJoey Hess <joey@gnu.kitenet.net>
Tue, 27 Jan 2009 01:05:36 +0000 (20:05 -0500)
commit848ff1bf5e218c57cc738a85ed02d7e1396c1d22
tree70819d0984c9c52c556b7b282ceffa4ad08eeccb
parent1f3f33fa67ade3bbc219f5bdc4f8e411162f3f28
parentc89925048f6c0b149d09b76ff122da2205b6ec86
Merge commit 'smcv/updated'