[OpenLP/f14/master: 6/6] Merge branch 'master' into f14

[Tim Bentley]

commit b57f3105637767a7cc798987f8a3d7cf1910dd3e
Merge: 21b407f e0bef29
Author: Tim Bentley <Tim.Bentley at gmail.com>
Date:   Sat Jan 8 12:42:38 2011 +0000

    Merge branch 'master' into f14
    
    Conflicts:
    	.gitignore
    	OpenLP.spec
    	sources

 .gitignore  |    1 +
 OpenLP.spec |    5 ++++-
 sources     |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---