[yash/f18: 2/2] Merge remote-tracking branch 'origin/master' into f18

[Mamoru Tasaka]

commit fe506bd490b780b174321f154c030e270e39ea24
Merge: a1d8b8f 6f18005
Author: Mamoru Tasaka <tasaka1 at localhost.localdomain>
Date:   Sun Oct 28 22:06:33 2012 +0900

    Merge remote-tracking branch 'origin/master' into f18

 .gitignore                                   |    1 +
 sources                                      |    2 +-
 yash-2.32.1-help-builtin-multichar.patch     |   16 -
 yash-2.32.1-man-ja-topspace-formatting.patch |  434 --------------------------
 yash.spec                                    |   15 +-
 5 files changed, 8 insertions(+), 460 deletions(-)
---