Elide non-DFSG compliant upstream components
authorBdale Garbee <bdale@gag.com>
Wed, 17 Aug 2011 19:13:15 +0000 (12:13 -0700)
committerBdale Garbee <bdale@gag.com>
Wed, 17 Aug 2011 19:13:15 +0000 (12:13 -0700)

Trivial merge