[imsettings/f15: 3/3] Merge remote-tracking branch 'origin/f16' into f15

[Akira TAGOH]

commit 9c31370909301adf19713e1e941e08a2c486c8ce
Merge: 17665ba 03e0f99
Author: Akira TAGOH <tagoh at redhat.com>
Date:   Fri Feb 10 14:21:22 2012 +0900

    Merge remote-tracking branch 'origin/f16' into f15

 imsettings-constraint-of-language.patch |   11 +++++++----
 imsettings-xinput-xcompose.patch        |   14 +++++++-------
 imsettings.spec                         |    7 ++++++-
 sources                                 |    2 +-
 4 files changed, 21 insertions(+), 13 deletions(-)
---