Merge branch 'obi/master' into experimental
authorAndreas Oberritter <obi@opendreambox.org>
Wed, 17 Nov 2010 16:44:36 +0000 (17:44 +0100)
committerAndreas Oberritter <obi@opendreambox.org>
Wed, 17 Nov 2010 16:44:36 +0000 (17:44 +0100)

Trivial merge