[ibus-fbterm/f12/master: 4/4] Merge branch 'master' into f12

[Ding-Yi Chen]

commit 057f237a147c184b0ebe9108b3edc2c0093e1e2b
Merge: 024304e 4ca1a53
Author: Ding-Yi Chen <dingyichen at gmail.com>
Date:   Mon Sep 20 17:16:28 2010 +1000

    Merge branch 'master' into f12
    
    Conflicts:
    	ibus-fbterm.spec

 ibus-fbterm.spec |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)
---