Merge branch 'lilypond/translation' into staging

Conflicts:
	Documentation/changes.tely
	Documentation/translations.itexi
	Documentation/web/news-front.itexi
	VERSION
	input/regression/layout-from.ly
	lily/context-def.cc

diff --cc Documentation/translations.itexi
index 5f854b6d0294645eb7cb9c3974889ec7fbb41ca9,937a88bd4b9104261989967ebce80856cb552b34..1377436f8758fb2084bd735e5472a27e28212199
--- 1/Documentation/translations.itexi
--- 2/Documentation/translations.itexi
+++ b/Documentation/translations.itexi
@@@ -16,8 -16,8 +16,7 @@@ td { border: 1px solid black; text-alig
  
  @end html
  @end ifhtml
- @emph{Last updated Thu Mar  1 13:47:50 UTC 2012
 -@emph{Last updated Sat Feb 25 23:32:38 UTC 2012
--}
++@emph{Last updated Thu Mar  1 13:47:50 UTC 2012}
  @multitable @columnfractions  0.5 0.5
  
  @headitem

diff --cc Documentation/web/community.itexi
Simple merge

diff --cc lily/book-scheme.cc
Simple merge

diff --cc lily/parser.yy
Simple merge

diff --cc ly/engraver-init.ly
Simple merge

diff --cc ly/music-functions-init.ly
Simple merge

diff --cc scm/lily-library.scm
Simple merge