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

[Jeffrey C. Ollie]

commit fbf3c5d5271d6f69a8b38bb8f3de7ef9b05dee6d
Merge: b4fa108 eb4f92b
Author: Jeffrey C. Ollie <jeff at ocjtech.us>
Date:   Fri Nov 19 14:13:16 2010 -0600

    Merge branch 'master' into f14

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