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

[Bill Nottingham]

commit de2ac3f8c1ae4fc5d059ce18735ab4c82474abe3
Merge: 50a357c 0e246e3
Author: Bill Nottingham <notting at redhat.com>
Date:   Wed Mar 16 17:14:17 2011 -0400

    Merge branch 'master' into el6

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