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

[tdawson]

commit 3d50c6733b3ba45e0d100c8289b61b240166826b
Merge: 3c89888 6c2d905
Author: Troy Dawson <tdawson at redhat.com>
Date:   Tue Mar 12 13:33:58 2013 -0500

    Merge branch 'master' into f18

 .gitignore                                   |    1 +
 000001_openshift_origin_node.conf            |   39 ---
 000001_openshift_origin_node_servername.conf |    5 -
 rubygem-openshift-origin-node.spec           |  383 ++++++++++++++++++++++----
 sources                                      |    2 +-
 5 files changed, 327 insertions(+), 103 deletions(-)
---