Merge branch 'master' of ssh://lxde.git.sourceforge.net/gitroot/lxde/gpicview
authorJulien Lavergne <julien.lavergne@gmail.com>
Thu, 23 Jun 2011 17:03:33 +0000 (19:03 +0200)
committerJulien Lavergne <julien.lavergne@gmail.com>
Thu, 23 Jun 2011 17:03:33 +0000 (19:03 +0200)

Trivial merge