[man-pages-ja/f13/master: 11/11] Merge remote branch 'origin/f14/master' into f13/master

[Akira TAGOH]

commit f786ea52dda8205756fc5333d4cfa865c71f79e6
Merge: a57160a bb07235
Author: Akira TAGOH <tagoh at redhat.com>
Date:   Fri Oct 15 19:42:08 2010 +0900

    Merge remote branch 'origin/f14/master' into f13/master
    
    Conflicts:
    	.gitignore
    	man-pages-ja.spec
    	sources

 .gitignore                       |    1 +
 echo.1                           |  143 +++++++++++++++
 man-pages-ja-IT603773-less.patch |  360 ++++++++++++++++++++++++++++++++++++++
 man-pages-ja-connect.2.patch     |    8 +-
 man-pages-ja.spec                |   38 ++++-
 sources                          |    2 +-
 6 files changed, 544 insertions(+), 8 deletions(-)
---