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

[tdawson]

commit 96f9c0d117e213a7cd27cf536fcd7655facf0b84
Merge: f14f6ba c8817a8
Author: Troy Dawson <tdawson at redhat.com>
Date:   Mon Feb 18 16:57:14 2013 -0600

    Merge branch 'master' into f18

 .gitignore                       |    1 +
 openshift-origin-port-proxy.spec |   31 ++++++++++++++++++-------------
 sources                          |    2 +-
 3 files changed, 20 insertions(+), 14 deletions(-)
---