[emacs-ibus/f14/master: 4/4] Merge branch 'master' into f14

[Daiki Ueno]

commit dc6a7d7a6b8a60da598eabd5ef0e5205e8203a01
Merge: 97d6ed2 b963f03
Author: Daiki Ueno <ueno at unixuser.org>
Date:   Thu Nov 4 11:47:40 2010 +0900

    Merge branch 'master' into f14
    
    Conflicts:
    	emacs-ibus.spec

 emacs-ibus.spec |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
---