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

Trivial merge