Merge branch 'master' of ssh+git://hanwen@git.sv.gnu.org/srv/git/lilypond

diff --cc lily/accidental-placement.cc
index f9cac96ac71d38320369faea4232191f8efced00,71c6af771ead00ccdbaf94586afd3f9cbd4af606..c706ff4a6915ccf9d0549fcbeaa6da33f52abf4c
--- 1/lily/accidental-placement.cc
--- 2/lily/accidental-placement.cc
+++ b/lily/accidental-placement.cc
@@@ -302,22 -302,20 +302,34 @@@ Accidental_placement::calc_positioning_
  
    vector_sort (heads, less<Grob*> ());
    uniq (heads);
+ 
+   vector<Grob *> stems;
+   for (vsize i = 0; i < heads.size  (); i++)
+     {
+       if (Grob *s = Rhythmic_head::get_stem (heads[i]))
+       stems.push_back (s);
+     }
+   
+   vector_sort (stems, less<Grob*> ());
+   uniq (stems);
+ 
    common[Y_AXIS] = common_refpoint_of_array (heads, common[Y_AXIS], Y_AXIS);
+   common[Y_AXIS] = common_refpoint_of_array (stems, common[Y_AXIS], Y_AXIS);
  
 +  vector<Grob *> stems;
 +  for (vsize i = 0; i < heads.size  (); i++)
 +    {
 +      if (Grob *s = Rhythmic_head::get_stem (heads[i]))
 +      {
 +        stems.push_back (s);
 +        common[Y_AXIS] = s->common_refpoint (common[Y_AXIS], Y_AXIS);
 +      }
 +    }
 +
 +  vector_sort (stems, less<Grob*> ());
 +  uniq (stems);
 +  
 +
    for (vsize i = apes.size (); i--;)
      {
        Accidental_placement_entry *ape = apes[i];

diff --cc lily/separation-item.cc
Simple merge