[eekboard/f16: 16/16] Merge branch 'master' into f16

[Daiki Ueno]

commit 3aeee0e1500ed4074cc9e1f74340c9b6e4d89ca4
Merge: 2d2839b bdac7fc
Author: Daiki Ueno <ueno at unixuser.org>
Date:   Tue Dec 6 14:41:14 2011 +0900

    Merge branch 'master' into f16

 eekboard.spec |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
---