[openshift-origin-cartridge-abstract/f17: 2/2] Merge branch 'master' into f17

[tdawson]

commit 26b6011130d5b498a50420a8dc76be5f7ff560f9
Merge: 0e31126 c7a7611
Author: Troy Dawson <tdawson at redhat.com>
Date:   Tue Mar 12 15:06:00 2013 -0500

    Merge branch 'master' into f17

 .gitignore                               |    1 +
 openshift-origin-cartridge-abstract.spec |  104 +++++++++++++++++++++++-------
 sources                                  |    2 +-
 3 files changed, 82 insertions(+), 25 deletions(-)
---