Merge branch 'obi/master' into experimental
authorAndreas Oberritter <obi@opendreambox.org>
Sun, 5 Dec 2010 02:59:56 +0000 (03:59 +0100)
committerAndreas Oberritter <obi@opendreambox.org>
Sun, 5 Dec 2010 02:59:56 +0000 (03:59 +0100)

Trivial merge