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

[Jeffrey C. Ollie]

commit 0297915f2d86063ac9d015e7641445ff37544f67
Merge: 3450d4d 063e1bc
Author: Jeffrey C. Ollie <jeff at ocjtech.us>
Date:   Tue Oct 12 07:04:20 2010 -0500

    Merge remote branch 'origin/master' into f13

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