Merge branch 'nmu'
authorBdale Garbee <bdale@gag.com>
Sun, 7 Aug 2011 08:12:16 +0000 (02:12 -0600)
committerBdale Garbee <bdale@gag.com>
Sun, 7 Aug 2011 08:12:16 +0000 (02:12 -0600)

Trivial merge