Merge branch 'obi/master'
authorAndreas Oberritter <obi@opendreambox.org>
Tue, 23 Nov 2010 13:01:44 +0000 (14:01 +0100)
committerAndreas Oberritter <obi@opendreambox.org>
Tue, 23 Nov 2010 13:01:44 +0000 (14:01 +0100)

Trivial merge