[ibus-table-chinese/el6: 2/2] Merge branch 'master' into el6

[Ding-Yi Chen]

commit f90f368979ff0628d0505693505e6669f4228f96
Merge: a52da87 780e707
Author: Ding-Yi Chen <dingyichen at gmail.com>
Date:   Mon Nov 26 17:38:51 2012 +1000

    Merge branch 'master' into el6

 .gitignore              |    1 +
 ibus-table-chinese.spec |   26 ++++----------------------
 sources                 |    2 +-
 3 files changed, 6 insertions(+), 23 deletions(-)
---