Merge remote-tracking branch 'pq/for-krh'
authorKristian Høgsberg <krh@bitplanet.net>
Wed, 25 Apr 2012 14:45:48 +0000 (10:45 -0400)
committerKristian Høgsberg <krh@bitplanet.net>
Wed, 25 Apr 2012 14:45:48 +0000 (10:45 -0400)

Trivial merge