[vlgothic-fonts/f13/master: 2/2] Merge remote branch 'origin/f14/master' into f13/master

[Akira TAGOH]

commit bd241cab84c34779677349d10b2cbedafa2f7340
Merge: 566a314 b7d08c4
Author: Akira TAGOH <tagoh at redhat.com>
Date:   Wed Dec 22 17:06:35 2010 +0900

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

 .gitignore          |    3 +++
 sources             |    2 +-
 vlgothic-fonts.spec |    7 +++++--
 3 files changed, 9 insertions(+), 3 deletions(-)
---