[bcfg2/f14/master: 9/10] Merge branch 'master' into f14/master

[Jeffrey C. Ollie]

commit 7a8a5441c537842833800d14874af33af023c1a2
Merge: 1aab60c ebbb05b
Author: Jeffrey C. Ollie <jeff at ocjtech.us>
Date:   Fri Nov 5 09:00:40 2010 -0500

    Merge branch 'master' into f14/master

 .gitignore            |   11 ++++++++---
 bcfg2-py27-auth.patch |   11 +++++++++++
 bcfg2.spec            |    9 +++++++--
 branch                |    1 +
 4 files changed, 27 insertions(+), 5 deletions(-)
---