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

[Akira TAGOH]

commit 17fd8cf4755a5307ed3813653540f173b5364b79
Merge: 9c31370 7cb0c14
Author: Akira TAGOH <tagoh at redhat.com>
Date:   Mon Mar 19 14:15:52 2012 +0900

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

 imsettings.spec |   10 ++++++++--
 sources         |    2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)
---