Merge branch 'cvs-head' of ssh+git://hanwen@repo.or.cz/srv/git/lilypond into master...

Conflicts:

	.gitignore
	input/regression/utf-8.ly

diff --cc input/regression/utf-8.ly
index 3a4cb6c39cffa7b17547b110b4eae3c753fe6d91,a9b4179face3c36905992cf53e9ac152888b56c8..4a82eab24b5ec7fab1d5b102cf5bdf3ca167f8a2
--- 1/input/regression/utf-8.ly
--- 2/input/regression/utf-8.ly
+++ b/input/regression/utf-8.ly
@@@ -45,6 -38,13 +38,13 @@@ hebrew = \lyricmode 
    זה כיף סתם לשמוע איך תנצח קרפד עץ טוב בגן.
  }
  
 - }
+ japanese = \lyricmode {  
+   いろはにほへど ちりぬるを
+   わがよたれぞ  つねならむ
+   うゐのおくや  まけふこえて
+   あさきゆめみじ ゑひもせず 
++}
+ 
  % "a legal song to you"
  portuguese = \lyricmode { 
    à vo cê uma can ção legal