Merge branch 'obi/master' into experimental
authorAndreas Oberritter <obi@opendreambox.org>
Wed, 1 Dec 2010 00:31:52 +0000 (01:31 +0100)
committerAndreas Oberritter <obi@opendreambox.org>
Wed, 1 Dec 2010 00:31:52 +0000 (01:31 +0100)

Trivial merge