[lilypond/f15: 17/17] Merge branch 'master' into f15

[Jon Ciesla]

commit d5bec862a3b7044ff20addd787fb924170424808
Merge: 8455594 ef34318
Author: Jon Ciesla <limb at jcomserv.net>
Date:   Mon Jun 6 10:09:41 2011 -0500

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

 .gitignore    |   15 +++++++++++++++
 lilypond.spec |   51 ++++++++++++++++++++++++++++++++++++++++++++++++---
 sources       |    2 +-
 3 files changed, 64 insertions(+), 4 deletions(-)
---