[nginx/f17: 5/5] Merge branch 'master' into f17

[Jamie Nguyen]

commit 8d1e2712d7dd4ceeae20a439fc2f098f8f4f1392
Merge: 499eea4 6afa9eb
Author: Jamie Nguyen <jamie at tomoyolinux.co.uk>
Date:   Sat Feb 25 00:34:02 2012 +0000

    Merge branch 'master' into f17
    
    Conflicts:
    	nginx.spec

 nginx.init      |  144 ------------------------------
 nginx.service   |   13 +++
 nginx.spec      |  266 +++++++++++++++++++++++++++++++------------------------
 nginx.sysconfig |    4 -
 ssl.conf        |    2 +-
 5 files changed, 165 insertions(+), 264 deletions(-)
---