[ibus-pinyin/f14/master: 3/3] Merge branch 'master' into f14

[Peng Wu]

commit 5e00cb9c094334054f9f27891d6e8ce6a4bba73e
Merge: 4af26ad 1e4ac29
Author: Peng Wu <alexepico at gmail.com>
Date:   Tue Sep 28 15:16:26 2010 +0800

    Merge branch 'master' into f14

 .gitignore       |    1 +
 ibus-pinyin.spec |    7 ++++++-
 sources          |    2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)
---