Merge remote branch 'smcv/ready/transient'
authorJoey Hess <joey@kitenet.net>
Wed, 9 Feb 2011 17:42:15 +0000 (13:42 -0400)
committerJoey Hess <joey@kitenet.net>
Wed, 9 Feb 2011 17:42:15 +0000 (13:42 -0400)
commitacd10522980712a91b8a801e974240ff90af829e
treee17285f96306cf3fc9d1a71b88d4ba1064bafc54
parent0c68cd556a7d2c7395aed2a4e101c0ced0e33726
parent44b0cea85f1641f33ccb305f9da6f96e812b84e9
Merge remote branch 'smcv/ready/transient'