Merge remote-tracking branch 'schmonz/portability'
authorJoey Hess <joey@kitenet.net>
Mon, 30 Jan 2012 19:20:54 +0000 (15:20 -0400)
committerJoey Hess <joey@kitenet.net>
Mon, 30 Jan 2012 19:20:54 +0000 (15:20 -0400)

Trivial merge