[imsettings/f16: 2/2] Merge remote-tracking branch 'origin/f17' into f16

[Akira TAGOH]

commit 60992841862deff891ecc7a900a800020101a59d
Merge: 7cb0c14 4f4ca85
Author: Akira TAGOH <tagoh at redhat.com>
Date:   Mon Apr 23 18:35:06 2012 +0900

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

 imsettings-lxde-disable-fallbackim.patch |   20 ++++++++++++++++++++
 imsettings-xfce-disable-fallbackim.patch |   20 ++++++++++++++++++++
 imsettings.spec                          |   11 ++++++++++-
 sources                                  |    2 +-
 4 files changed, 51 insertions(+), 2 deletions(-)
---