Log Message:
print/lilypond: Fix redefinition of Moment S

This problem, detected by gcc 4.6+, was fixed upstream a year ago.
Bring that patch in to fix the build.