Merge branch 'bug_599_picload_fd_leak'
authorghost <andreas.monzner@multimedia-labs.de>
Tue, 16 Nov 2010 10:13:54 +0000 (11:13 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Tue, 16 Nov 2010 10:13:54 +0000 (11:13 +0100)

Trivial merge