Merge branch 'obi/master-20110412' into experimental
authorAndreas Oberritter <obi@opendreambox.org>
Tue, 12 Apr 2011 12:50:54 +0000 (14:50 +0200)
committerAndreas Oberritter <obi@opendreambox.org>
Tue, 12 Apr 2011 12:50:54 +0000 (14:50 +0200)

Trivial merge