[gramps/f13/master: 11/11] Merge remote branch 'origin/master' into f13

[Jeffrey C. Ollie]

commit 3450d4d9eed7a4c72210564364f87bc4f2416f1d
Merge: 8eab643 706fd71
Author: Jeffrey C. Ollie <jeff at ocjtech.us>
Date:   Sun Oct 10 21:59:37 2010 -0500

    Merge remote branch 'origin/master' into f13

 .gitignore  |    3 ++-
 gramps.spec |   47 +++++++++++++++++++++++++++++++++++++++++++----
 sources     |    2 +-
 3 files changed, 46 insertions(+), 6 deletions(-)
---