Merge commit 'refs/merge-requests/2' of git://gitorious.org/geeqie/geeqie into merge...
authorVladimir Nadvornik <nadvornik@suse.cz>
Tue, 21 Aug 2012 17:25:58 +0000 (19:25 +0200)
committerVladimir Nadvornik <nadvornik@suse.cz>
Tue, 21 Aug 2012 17:25:58 +0000 (19:25 +0200)

Trivial merge