Merge remote-tracking branch 'bnf/fix'
authorKristian Høgsberg <krh@bitplanet.net>
Thu, 23 Jun 2011 21:44:13 +0000 (17:44 -0400)
committerKristian Høgsberg <krh@bitplanet.net>
Thu, 23 Jun 2011 21:44:13 +0000 (17:44 -0400)

Trivial merge