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)
commit545bf43670d4c31a260c82c4d99aa878679a8340
treefd459f58209baa8afad252c60110b6d10db7b5b2
parent02898461f24530159b37fcae22a8b79c86b12091
parent1dc565c9ae1e2bd94f4d3bbb9e798a1eb0f20f79
Merge remote-tracking branch 'schmonz/portability'