[python-manuel/f18: 2/2] Merge branch 'master' into f18

[Jerry James]

commit 90ecab277f5c71f6b7ae398c21bb9907c73008d9
Merge: 1725ac8 e3d611c
Author: Jerry James <jamesjer at betterlinux.com>
Date:   Tue Feb 19 16:17:41 2013 -0700

    Merge branch 'master' into f18

 .gitignore         |    3 ++-
 python-manuel.spec |   12 ++++++++++--
 sources            |    3 ++-
 3 files changed, 14 insertions(+), 4 deletions(-)
---