Merge branch 'SKR04-fixes'
authorMoritz Bunkus <m.bunkus@linet-services.de>
Wed, 29 Dec 2010 15:03:32 +0000 (16:03 +0100)
committerMoritz Bunkus <m.bunkus@linet-services.de>
Wed, 29 Dec 2010 15:03:32 +0000 (16:03 +0100)

Trivial merge