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

[Peng Wu]

commit 29639f08e3625f73d5fbeb13b8567b0836b406b4
Merge: 984e768 1e4ac29
Author: Peng Wu <alexepico at gmail.com>
Date:   Tue Sep 28 15:25:33 2010 +0800

    Merge branch 'master' into f13

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