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

Conflicts:

	lily/grob-property.cc

diff --cc lily/axis-group-interface.cc
Simple merge

diff --cc lily/context.cc
Simple merge

diff --cc lily/grob-property.cc
index f89d42194d04324ac4a636838552fd6af66f04d8,e7b59d954d6559d1babf22a0a0d173c0e1de8b38..084ea42fbdb60ede609beddcf35b61cf8889f876
--- 1/lily/grob-property.cc
--- 2/lily/grob-property.cc
+++ b/lily/grob-property.cc
@@@ -70,22 -84,8 +70,21 @@@ Grob::instrumented_set_property (SCM sy
                             scm_from_int (line),
                             scm_from_locale_string (fun),
                             sym, v, SCM_UNDEFINED));
 +  internal_set_property (sym, v);
  }
 -#else
 +#endif
 +
 +SCM
 +Grob::get_property_alist_chain (SCM def) const
 +{
 +  return scm_list_n (mutable_property_alist_,
 +                   immutable_property_alist_,
 +                   def,
 +                   SCM_UNDEFINED);
 +}
 +
- 
 +extern void check_interfaces_for_property (Grob const *me, SCM sym);
 +
  void
  Grob::internal_set_property (SCM sym, SCM v)
  {

diff --cc lily/include/context.hh
Simple merge

diff --cc lily/include/grob.hh
Simple merge

diff --cc lily/main.cc
Simple merge

diff --cc scm/lily.scm
Simple merge