Merge branches '3m', 'egalax', 'logitech', 'magicmouse', 'ntrig' and 'roccat' into...
authorJiri Kosina <jkosina@suse.cz>
Sat, 23 Oct 2010 20:47:38 +0000 (22:47 +0200)
committerJiri Kosina <jkosina@suse.cz>
Sat, 23 Oct 2010 20:47:38 +0000 (22:47 +0200)

Trivial merge