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

[tdawson]

commit b9e40c82c21d0d7d0b670544c01e44fd0b266248
Merge: 0fa144c acdb801
Author: Troy Dawson <tdawson at redhat.com>
Date:   Mon Dec 10 10:54:14 2012 -0600

    Merge branch 'master' into f18

 ...origin-broker-0.6.17-gemfile-dependancies.patch |    8 +++++---
 openshift-origin-broker.spec                       |    8 +++++++-
 2 files changed, 12 insertions(+), 4 deletions(-)
---