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

Trivial merge