[nkf/f13/master: 5/5] Merge remote-tracking branch 'origin/f14/master' into f13/master

[Akira TAGOH]

commit c6252ea54afd269de9386241d32011a6c570ce62
Merge: 3bee4c3 ff2dbe6
Author: Akira TAGOH <akira at tagoh.org>
Date:   Wed Mar 16 12:35:08 2011 +0900

    Merge remote-tracking branch 'origin/f14/master' into f13/master

 nkf.spec |   17 +++++++++++++----
 sources  |    2 +-
 2 files changed, 14 insertions(+), 5 deletions(-)
---