OpenSong SVN r877 and r878

http://sourceforge.net/p/opensong/code/877/
http://sourceforge.net/p/opensong/code/878/