Merge branch 'master' of git://pcmanfm.git.sourceforge.net/gitroot/pcmanfm/pcmanfm
authorMartin Bagge / brother (or Pootle...) <brother@bsnet.se>
Thu, 28 Oct 2010 16:00:19 +0000 (18:00 +0200)
committerMartin Bagge / brother (or Pootle...) <brother@bsnet.se>
Thu, 28 Oct 2010 16:00:19 +0000 (18:00 +0200)

Trivial merge