[kmymoney/f17: 2/2] Merge branch 'master' into f17

[Rex Dieter]

commit c622cecd94083b88d4a56b22915585215b495317
Merge: 3d8b5f2 4cab7c1
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat Mar 3 07:56:58 2012 -0600

    Merge branch 'master' into f17
    
    Conflicts:
    	kmymoney.spec

 .gitignore    |    1 +
 kmymoney.spec |   14 ++++++--------
 sources       |    2 +-
 3 files changed, 8 insertions(+), 9 deletions(-)
---