Merge remote branch 'nobled/for-krh'
authorKristian Høgsberg <krh@bitplanet.net>
Tue, 25 Jan 2011 15:17:16 +0000 (10:17 -0500)
committerKristian Høgsberg <krh@bitplanet.net>
Tue, 25 Jan 2011 15:17:16 +0000 (10:17 -0500)

Trivial merge