Merge branch 'master' of git://pcmanfm.git.sourceforge.net/gitroot/pcmanfm/pcmanfm
authorMartin Bagge / brother <brother@bsnet.se>
Tue, 23 Oct 2012 21:03:01 +0000 (23:03 +0200)
committerMartin Bagge / brother <brother@bsnet.se>
Tue, 23 Oct 2012 21:03:01 +0000 (23:03 +0200)

Trivial merge