Merge branches 'bug/safe-temp-files', 'bug/exit-fullscreen-mode', 'feature/jumpnbump_...
authorAnsgar Burchardt <ansgar-guest@alioth.debian.org>
Mon, 8 Dec 2008 18:54:23 +0000 (8 19:54 +0100)
committerAnsgar Burchardt <ansgar-guest@alioth.debian.org>
Mon, 8 Dec 2008 18:54:23 +0000 (8 19:54 +0100)

Trivial merge