Merge branch 'master' of ssh://lxde.git.sourceforge.net/gitroot/lxde/lxinput
authorJulien Lavergne <julien.lavergne@gmail.com>
Fri, 3 Jun 2011 18:25:47 +0000 (20:25 +0200)
committerJulien Lavergne <julien.lavergne@gmail.com>
Fri, 3 Jun 2011 18:25:47 +0000 (20:25 +0200)

Trivial merge