Merge branch 'bug_480_nfiflash' into experimental
authorFraxinas <andreas.frisch@multimedia-labs.de>
Tue, 24 Aug 2010 13:04:25 +0000 (15:04 +0200)
committerFraxinas <andreas.frisch@multimedia-labs.de>
Tue, 24 Aug 2010 13:04:25 +0000 (15:04 +0200)

Trivial merge