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

[Jeffrey C. Ollie]

commit 4b3f945b02a19a0f39588e3247964cc860378331
Merge: 0297915 eb4f92b
Author: Jeffrey C. Ollie <jeff at ocjtech.us>
Date:   Fri Nov 19 14:48:51 2010 -0600

    Merge branch 'master' into f13

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