Merge branch 'master' into templatemove
authorJoey Hess <joey@kitenet.net>
Sat, 24 Apr 2010 04:47:54 +0000 (00:47 -0400)
committerJoey Hess <joey@kitenet.net>
Sat, 24 Apr 2010 04:47:54 +0000 (00:47 -0400)

Trivial merge