Merge remote branch 'bnf/simple_client'
authorKristian Høgsberg <krh@bitplanet.net>
Sat, 15 Jan 2011 00:13:22 +0000 (19:13 -0500)
committerKristian Høgsberg <krh@bitplanet.net>
Sat, 15 Jan 2011 00:13:22 +0000 (19:13 -0500)

Trivial merge