Merge branch 'opendreambox-1.6' of git://git.opendreambox.org/git/openembedded into...
authorFraxinas <andreas.frisch@multimedia-labs.de>
Mon, 20 Sep 2010 10:13:51 +0000 (12:13 +0200)
committerFraxinas <andreas.frisch@multimedia-labs.de>
Mon, 20 Sep 2010 10:13:51 +0000 (12:13 +0200)

Trivial merge