Merge ssh+git://hanwen@repo.or.cz/srv/git/lilypond into master-hanwen

diff --combined ChangeLog
index a85ba6820ddc10c7baeb2ab3401cda6583106e4d,7287810d83c3135a5dbaa4272842b7d6f09d4140..2cc6ce1b7287999cfed4532275b5f350e354653a
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -6,7 -6,7 +6,7 @@@
  
        * lily/engraver.cc: 
        * lily/grob-property.cc: 
 -      use  SCM_ASSERT_TYPE for graphing functions.
 +      use SCM_ASSERT_TYPE for graphing functions.
  
        * lily/cluster.cc: 
        formatting.
@@@ -19,7 -19,8 +19,8 @@@
  
        * lily/note-collision.cc: 
        * input/regression/collision-merge-differently-headed.ly: 
-       Examine Stem::duration_log() for preventing merge of quarter and halfnote. Fixes collision-heads.ly. Add separate regtest for that.
+       Examine Stem::duration_log() for preventing merge of quarter and
+       halfnote.  Fixes collision-heads.ly.  Add separate regtest for that.
  
        * scripts/lilypond-invoke-editor.scm: 
        don't use guile -e main execution.
@@@ -83,7 -84,10 +84,10 @@@
        * scm/define-music-types.scm: 
        * scm/output-lib.scm: 
        * lily/balloon-engraver.cc: 
-       rewrite balloon-text support. This is now a separate grob, with itsvictim as the parent. This involves addingBalloon_engraver, AnnotateOutputEvent, annotate-output-event,\balloonText, \balloonGrobText, and modifying Balloon_interface::print.
+       rewrite balloon-text support.  This is now a separate grob, with
+       itsvictim as the parent.  This involves addingBalloon_engraver,
+       AnnotateOutputEvent, annotate-output-event,\balloonText,
+       \balloonGrobText, and modifying Balloon_interface::print.
  
        * lily/paper-score.cc: 
        remove progress again