[gramps/f14/master: 4/4] Merge remote branch 'origin/master' into f14

[Jeffrey C. Ollie]

commit eceae068628ffa0882995f525efce22cf43d71ad
Merge: c512760 706fd71
Author: Jeffrey C. Ollie <jeff at ocjtech.us>
Date:   Sun Oct 10 21:44:09 2010 -0500

    Merge remote branch 'origin/master' into f14

 .gitignore  |    1 +
 gramps.spec |   32 +++++++++++++++++++++++++++-----
 sources     |    2 +-
 3 files changed, 29 insertions(+), 6 deletions(-)
---