[fontik/f14/master: 3/3] Merge branch 'master' into f14

[Daiki Ueno]

commit 0256232377704b1c16dc7b1f7300b26936125528
Merge: b0f37c4 b5ea3e1
Author: Daiki Ueno <ueno at unixuser.org>
Date:   Mon Aug 30 10:53:45 2010 +0900

    Merge branch 'master' into f14
    
    Conflicts:
    	fontik.spec

 fontik.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---