Merge remote branch 'nobled/fixes2'
authorKristian Høgsberg <krh@bitplanet.net>
Thu, 6 Jan 2011 19:22:59 +0000 (14:22 -0500)
committerKristian Høgsberg <krh@bitplanet.net>
Thu, 6 Jan 2011 19:22:59 +0000 (14:22 -0500)

Trivial merge