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

[tdawson]

commit 09593fde33ebc3ab482e6fdfaa1b17f47bf8c4e9
Merge: 4129a26 9c06221
Author: Troy Dawson <tdawson at redhat.com>
Date:   Tue Dec 4 15:32:05 2012 -0600

    Merge branch 'master' into f18

 .gitignore                                         |    1 +
 ..._node.conf => 000001_openshift_origin_node.conf |    3 +-
 openshift-origin-node_gemspec_fixes.patch          |   12 -
 openshift-origin-node_shebang_fix.patch            |    8 -
 openshift-origin-node_version_fix.patch            |   11 -
 rubygem-openshift-origin-node.spec                 |  297 +++++++++++---------
 sources                                            |    2 +-
 7 files changed, 169 insertions(+), 165 deletions(-)
---