Merge branch 'flash'
authorMoritz Bunkus <m.bunkus@linet-services.de>
Thu, 30 Dec 2010 14:57:49 +0000 (15:57 +0100)
committerMoritz Bunkus <m.bunkus@linet-services.de>
Thu, 30 Dec 2010 14:57:49 +0000 (15:57 +0100)

Trivial merge