Merge branch 'obi/master'
authorAndreas Oberritter <obi@opendreambox.org>
Thu, 3 Mar 2011 15:09:07 +0000 (16:09 +0100)
committerAndreas Oberritter <obi@opendreambox.org>
Thu, 3 Mar 2011 15:09:07 +0000 (16:09 +0100)

Trivial merge