[kcm_touchpad/f14/master: 7/7] Merge branch 'master'

[Kevin Kofler]

commit f4f59ac20c49c965d60ce2e7b6682ce1a122a9d8
Merge: 3ee9544 17b0025
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date:   Tue Feb 8 11:56:11 2011 +0100

    Merge branch 'master'

 ...ouchpad-0.3.1-disable-smart-mode-settings.patch |   13 ++
 kcm_touchpad-0.3.1-fix-circular-scrolling.patch    |   35 ++++
 kcm_touchpad-0.3.1-fix-high-sensitivity.patch      |   29 +++
 kcm_touchpad-0.3.1-load-error-checking.patch       |  194 ++++++++++++++++++++
 ..._touchpad-0.3.1-new-systemsettings-layout.patch |    0
 kcm_touchpad-0.3.1-scrollbar.patch                 |   42 +++++
 kcm_touchpad.spec                                  |   44 ++++-
 kcmtouchpadrc                                      |   26 ---
 8 files changed, 348 insertions(+), 35 deletions(-)
---