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)
commit8d85e886fc3d578fd3c9b3942b3bd113bb13c622
treeb3ce1206d97fdf195f81418f5e12079ab1fee0f1
parentcff904e69d28f05a97105502bfcb027adac247b5
parent2eae9e3f1cec75b5c03597a2c45bb6f561f41377
Merge remote-tracking branch 'bnf/fixes'