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

[tdawson]

commit 7b30ab7410383f3df7e364db65a77fcf20002e80
Merge: c99188e d5f07e7
Author: Troy Dawson <tdawson at redhat.com>
Date:   Wed Jan 30 08:35:35 2013 -0600

    Merge branch 'master' into f17

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