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

[Akira TAGOH]

commit 6035b91892cf0f40669e93d58a8e21b905ac870f
Merge: d813eec 0e189c8
Author: Akira TAGOH <tagoh at redhat.com>
Date:   Thu Nov 22 18:49:39 2012 +0900

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

 imsettings-mate15.patch |  228 +++++++++++++++++++++++++++++++++++++++++++++++
 imsettings.spec         |   10 ++-
 2 files changed, 235 insertions(+), 3 deletions(-)
---
diff --cc imsettings.spec
index 8252e71,35de38b..a3b35f7
--- a/imsettings.spec
+++ b/imsettings.spec
@@@ -292,9 -292,13 +293,12 @@@ f
  
  
  %changelog
+ * Thu Nov 22 2012 Akira TAGOH <tagoh at redhat.com> - 1.2.9-3
+ - Add MATE 1.5 support
+ 
  * Wed Oct 17 2012 Akira TAGOH <tagoh at redhat.com> - 1.2.9-2
  - Add MATE Desktop support. (#866328)
 -- Drop imsettings-*-disable-fallbackim.patch. no need to stop
 -  fallback anymore.
 +- Disable fallback immodule feature entirely.
  
  * Mon Apr 23 2012 Akira TAGOH <tagoh at redhat.com> - 1.2.9-1
  - New upstream release.