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

[Daiki Ueno]

commit 3fea1e0acc6aa6ae3d730db358429e5b40ba9842
Merge: f26787d bdac7fc
Author: Daiki Ueno <ueno at unixuser.org>
Date:   Tue Dec 6 14:42:20 2011 +0900

    Merge branch 'master' into f15

 .gitignore    |    2 ++
 eekboard.spec |    8 ++++----
 2 files changed, 6 insertions(+), 4 deletions(-)
---