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

Trivial merge