Merge remote-tracking branch 'bnf/fixes'
authorKristian Høgsberg <krh@bitplanet.net>
Fri, 18 Mar 2011 04:15:25 +0000 (00:15 -0400)
committerKristian Høgsberg <krh@bitplanet.net>
Fri, 18 Mar 2011 04:15:25 +0000 (00:15 -0400)

Trivial merge