Merge branch 'master' of git://lxde.git.sourceforge.net/gitroot/lxde/lxinput
authorMartin Bagge / brother (or Pootle...) <brother@bsnet.se>
Mon, 31 May 2010 18:48:57 +0000 (20:48 +0200)
committerMartin Bagge / brother (or Pootle...) <brother@bsnet.se>
Mon, 31 May 2010 18:48:57 +0000 (20:48 +0200)

Trivial merge