[migemo/f17: 2/2] Merge branch 'master' into f17

[Vít Ondruch]

commit 7b0b5ef4047d350a2a25524f5353f8770fdaa1b5
Merge: 9d2de40 18848c6
Author: Vít Ondruch <vondruch at redhat.com>
Date:   Fri Mar 2 13:12:38 2012 +0100

    Merge branch 'master' into f17

 migemo-ruby-1.9.patch |  145 +++++++++++++++++++++++++++++++++++++++++++++++++
 migemo.spec           |   20 +++++--
 2 files changed, 159 insertions(+), 6 deletions(-)
---