[gnucash/el6/master: 10/10] Merge branch 'master' into el6

[Bill Nottingham]

commit 1560d550c159372bf92180e00229e3ed06b42297
Merge: b88d291 c784523
Author: Bill Nottingham <notting at redhat.com>
Date:   Thu Mar 3 15:52:36 2011 -0500

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore
    	gnucash.spec
    	sources

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