[mozc/f17: 5/5] Merge remote-tracking branch 'origin/master' into f17

[Akira TAGOH]

commit faaf26fc54f7ce1776104fd06e0c1cba511ecacd
Merge: f999c8a d1765fd
Author: Akira TAGOH <tagoh at redhat.com>
Date:   Tue Mar 27 13:47:36 2012 +0900

    Merge remote-tracking branch 'origin/master' into f17
    
    Conflicts:
    	mozc.spec

 .gitignore                |    1 +
 mozc-fix-build-fail.patch |   12 ------------
 mozc-fix-dirs.patch       |   12 ++++++------
 mozc.spec                 |    9 +++++----
 sources                   |    1 +
 5 files changed, 13 insertions(+), 22 deletions(-)
---
diff --cc mozc.spec
index b36c8ed,294a77e..155d0eb
--- a/mozc.spec
+++ b/mozc.spec
@@@ -260,8 -258,11 +258,11 @@@ rm -rf $RPM_BUILD_ROO
  %{_xemacs_sitelispdir}/%{pkg}/*.el
  
  %changelog
+ * Mon Mar 26 2012 Akira TAGOH <tagoh at redhat.com> - 1.4.1033.102-1
+ - New upstream release.
+ 
 -* Fri Mar  9 2012 Takao Fujiwara <tfujiwar at redhat.com> - 1.4.1003.102-2
 -- Rebuild for ibus 1.4.99.20120304
 +* Thu Mar 22 2012 Akira TAGOH <tagoh at redhat.com> - 1.4.1003.102-2
 +- Rebuild against new ibus.
  
  * Wed Mar  8 2012 Akira TAGOH <tagoh at redhat.com> - 1.4.1003.102-1
  - New upstream release.