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

[tdawson]

commit 22f3e0c1dd612acd828f2e913a645b98d2a1c39c
Merge: eebc3e9 3823b72
Author: Troy Dawson <tdawson at redhat.com>
Date:   Mon Feb 18 16:57:37 2013 -0600

    Merge branch 'master' into f18

 .gitignore                                         |    1 +
 ...-origin-broker-1.4.1-gemfile-dependancies.patch |   11 +-
 openshift-origin-broker.spec                       |  151 +++++++++++++++-----
 sources                                            |    2 +-
 4 files changed, 121 insertions(+), 44 deletions(-)
---