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

[tdawson]

commit 601b4f308a759b210f693503389b96f129a86142
Merge: 3693445 6bfdca6
Author: Troy Dawson <tdawson at redhat.com>
Date:   Wed Jan 30 09:57:32 2013 -0600

    Merge branch 'master' into f18

 .gitignore                                   |    1 +
 000001_openshift_origin_node.conf            |   11 +++-
 000001_openshift_origin_node_servername.conf |    5 ++
 rubygem-openshift-origin-node.spec           |   91 +++++++++++++++++---------
 sources                                      |    2 +-
 5 files changed, 77 insertions(+), 33 deletions(-)
---