Merge remote branch 'smcv/ready/transient-autoindex'
authorJoey Hess <joey@kitenet.net>
Wed, 9 Feb 2011 18:00:59 +0000 (14:00 -0400)
committerJoey Hess <joey@kitenet.net>
Wed, 9 Feb 2011 18:00:59 +0000 (14:00 -0400)

Trivial merge