Merge branch 'obi/master-20110329' into experimental
authorAndreas Oberritter <obi@opendreambox.org>
Wed, 30 Mar 2011 13:56:29 +0000 (15:56 +0200)
committerAndreas Oberritter <obi@opendreambox.org>
Wed, 30 Mar 2011 13:56:29 +0000 (15:56 +0200)

Trivial merge