Merge branch 'obi/master' into experimental
authorAndreas Oberritter <obi@opendreambox.org>
Tue, 22 Feb 2011 17:54:12 +0000 (18:54 +0100)
committerAndreas Oberritter <obi@opendreambox.org>
Tue, 22 Feb 2011 17:54:12 +0000 (18:54 +0100)

Trivial merge