[mozc/f14/master: 3/3] Merge remote branch 'origin/f15/master' into f14/master

[Akira TAGOH]

commit 06b62852bb7f25a95620322ea6721de2a47806be
Merge: 90fb929 a22a9cf
Author: Akira TAGOH <tagoh at redhat.com>
Date:   Wed Mar 2 12:25:14 2011 +0900

    Merge remote branch 'origin/f15/master' into f14/master

 .gitignore |    1 +
 mozc.spec  |   12 +++++++++---
 sources    |    2 +-
 3 files changed, 11 insertions(+), 4 deletions(-)
---
diff --cc mozc.spec
index dcb562e,ad54a12..48b78fb
--- a/mozc.spec
+++ b/mozc.spec
@@@ -38,9 -38,9 +38,9 @@@ Source1:	mozc-init.e
  Patch0:		mozc-build-verbosely.patch
  
  BuildRequires:	python gettext
- BuildRequires:	openssl-devel libstdc++-devel zlib-devel libcurl-devel gtest-devel protobuf-devel qt-devel
+ BuildRequires:	openssl-devel libstdc++-devel zlib-devel libcurl-devel gtest-devel protobuf-devel glib2-devel qt-devel
  BuildRequires:	gyp >= 0.1-0.4.840svn
 -BuildRequires:	ibus-devel >= 1.3.99
 +BuildRequires:	ibus-devel
  BuildRequires:	scim-devel
  BuildRequires:	emacs
  BuildRequires:	xemacs xemacs-packages-extra