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

Trivial merge