From: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu, 8 Feb 2007 00:25:55 +0000 (+1030)
Subject: Merge branch 'master'
X-Git-Tag: inputproto-1.9.99.1~42
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=025e4cdde8267d678dc5105e11c7cd66e2ad89b5;p=platform%2Fupstream%2Finputproto.git

Merge branch 'master'
---

025e4cdde8267d678dc5105e11c7cd66e2ad89b5