[kcm_touchpad/f13/master: 6/6] Merge remote branch 'origin/master' into f13/master

[Rex Dieter]

commit d0f18e03919109b56298460dea99d6201270ce97
Merge: c894813 ee5accd
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Oct 28 08:53:52 2010 -0500

    Merge remote branch 'origin/master' into f13/master
    
    Conflicts:
    	.gitignore
    	kcm_touchpad.spec

 .gitignore                                  |    2 +-
 kcm_touchpad-new-systemsettings-layout.diff |   12 ++++++++++++
 kcm_touchpad.spec                           |    9 +++++++--
 3 files changed, 20 insertions(+), 3 deletions(-)
---