Merge branch 'master' of git://lxde.git.sourceforge.net/gitroot/lxde/lxpanel
authorMartin Bagge / brother <brother@bsnet.se>
Fri, 29 Jul 2011 23:00:24 +0000 (01:00 +0200)
committerMartin Bagge / brother <brother@bsnet.se>
Fri, 29 Jul 2011 23:00:24 +0000 (01:00 +0200)

Trivial merge