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

[Akira TAGOH]

commit 7cb0c140190d327825039ca857bcff8c80f0228a
Merge: 03e0f99 abe7b2d
Author: Akira TAGOH <tagoh at redhat.com>
Date:   Mon Mar 19 14:05:01 2012 +0900

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

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