[gnucash/f13/master: 2/2] Merge branch 'master' into f13

[Bill Nottingham]

commit 55ac9bc72da397df57c46eec0617ec4b95b8a696
Merge: b60ac92 0e246e3
Author: Bill Nottingham <notting at redhat.com>
Date:   Wed Mar 16 17:18:20 2011 -0400

    Merge branch 'master' into f13

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