Merge branch 'bug_480_nfiflash' into experimental
authorFraxinas <andreas.frisch@multimedia-labs.de>
Wed, 1 Sep 2010 13:55:56 +0000 (15:55 +0200)
committerFraxinas <andreas.frisch@multimedia-labs.de>
Wed, 1 Sep 2010 13:55:56 +0000 (15:55 +0200)

Trivial merge