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

[Jeffrey C. Ollie]

commit b4fa1088530e9042d28fb8cc19c3e2a52bb6686f
Merge: eceae06 063e1bc
Author: Jeffrey C. Ollie <jeff at ocjtech.us>
Date:   Tue Oct 12 07:02:05 2010 -0500

    Merge remote branch 'origin/master' into f14

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