[ipa-ex-mincho-fonts/f13/master: 3/3] Merge remote branch 'origin/f14/master' into f13/master

[Akira TAGOH]

commit 0edac357526cd4e12735f6a75550d93976a6eba3
Merge: a33f22f fdaaa37
Author: Akira TAGOH <tagoh at redhat.com>
Date:   Mon Dec 6 20:23:18 2010 +0900

    Merge remote branch 'origin/f14/master' into f13/master
    
    Conflicts:
    	.gitignore

 ipa-ex-mincho-fonts.spec |    7 +++++--
 sources                  |    2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)
---