Merge remote-tracking branch 'smcv/ready/transient-rm'
authorJoey Hess <joey@kitenet.net>
Sun, 8 Apr 2012 19:54:25 +0000 (15:54 -0400)
committerJoey Hess <joey@kitenet.net>
Sun, 8 Apr 2012 19:54:25 +0000 (15:54 -0400)

Trivial merge