Merge branch 'master' of git://pcmanfm.git.sourceforge.net/gitroot/pcmanfm/pcmanfm
authorMartin Bagge / brother <brother@bsnet.se>
Sun, 30 Sep 2012 21:00:46 +0000 (23:00 +0200)
committerMartin Bagge / brother <brother@bsnet.se>
Sun, 30 Sep 2012 21:00:46 +0000 (23:00 +0200)

Trivial merge