[openshift-origin-broker/f18: 2/2] Merge branch 'master' into f18

[tdawson]

commit eebc3e92f7c99032daba76bd4f9cf7e815e0fa5c
Merge: 348727e 49e9612
Author: Troy Dawson <tdawson at redhat.com>
Date:   Wed Jan 30 15:06:24 2013 -0600

    Merge branch 'master' into f18

 .gitignore                                         |    1 +
 ...-origin-broker-1.1.2-gemfile-dependancies.patch |   10 ++--
 openshift-origin-broker.spec                       |   72 +++++++++++++++++++-
 sources                                            |    2 +-
 4 files changed, 76 insertions(+), 9 deletions(-)
---