[ibus-table/f14/master: 4/4] Merge remote branch 'origin/master' into f14/master

[Jens Petersen]

commit 1c9d81aba4ad07613362f8a97164e75bedfdb543
Merge: d4fbe88 a362d1d
Author: Jens Petersen <petersen at redhat.com>
Date:   Wed Sep 1 17:43:33 2010 +1000

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

 ibus-table.spec |   18 ++++++------------
 1 files changed, 6 insertions(+), 12 deletions(-)
---