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

Trivial merge