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)
commitb1ba0d1f997c4715c444edeb7371a47907f404ed
treed03d277134bdc0d50a5309f12bd7ffc814b23918
parent9d4db0996f48872482409345e6c458a46b9e8630
parentb7c00a437643480a9573f97c91d6fca7acce895f
Merge remote-tracking branch 'bnf/fix'