Merge remote branch 'smcv/ready/transient-aggregate'
authorJoey Hess <joey@kitenet.net>
Wed, 9 Feb 2011 17:50:03 +0000 (13:50 -0400)
committerJoey Hess <joey@kitenet.net>
Wed, 9 Feb 2011 17:50:03 +0000 (13:50 -0400)

Trivial merge