[lilypond/f17: 10/10] Merge branch 'master' into f17

[Jon Ciesla]

commit cf31890953aec59418ba91d8c3ab2907f151e752
Merge: b4604d7 51cbaab
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Fri May 4 08:22:31 2012 -0500

    Merge branch 'master' into f17
    
    Conflicts:
    	lilypond.spec

 .gitignore    |    9 ++++
 lilypond.spec |  129 ++++++++++++++-------------------------------------------
 sources       |    2 +-
 3 files changed, 42 insertions(+), 98 deletions(-)
---