[olpc-kbdshim/f14] release 25

[Paul Fox]

commit e8139840437a180ee78e5d9c851d285cc47480d3
Author: Paul Fox <pgf at laptop.org>
Date:   Mon Mar 12 13:45:07 2012 -0400

    release 25

 olpc-kbdshim.spec |   10 +++++++---
 sources           |    2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/olpc-kbdshim.spec b/olpc-kbdshim.spec
index a009516..fa4b132 100644
--- a/olpc-kbdshim.spec
+++ b/olpc-kbdshim.spec
@@ -1,13 +1,13 @@
 Summary: OLPC XO keyboard support daemon
 Name: olpc-kbdshim
-Version: 24
-Release: 2%{?dist}
+Version: 25
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 URL: http://dev.laptop.org/git/users/pgf/olpc-kbdshim/tree/README
 # Source0: the source tarball is created by "make tarball" from within
 # a clone of this git tree: git://dev.laptop.org/users/pgf/olpc-kbdshim
-Source0: olpc-kbdshim-24-gitcf341cb.tar.gz
+Source0: olpc-kbdshim-25-git2ed1f27.tar.gz
 
 BuildRequires: kernel-headers, pkgconfig, glib2-devel
 BuildRequires: dbus-glib-devel, libudev-devel
@@ -52,6 +52,10 @@ mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/init
 
 
 %changelog
+* Thu Mar 12 2012 Paul Fox <pgf at laptop.org>
+- 25-1
+- merge of XO-3 touchscreen support, support for 1.75 touchscreens
+
 * Fri Feb  3 2012 Paul Fox <pgf at laptop.org>
 - 24-1
 - use new psmouse driver control to disable touchpad in ebook mode
diff --git a/sources b/sources
index 1af05aa..702afe6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-13076da917dc545292014cc1005b4603  olpc-kbdshim-24-gitcf341cb.tar.gz
+fca359835171689cfee4c87744645518  olpc-kbdshim-25-git2ed1f27.tar.gz