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

[Jamie Nguyen]

commit b4063ccba5c8cf93ca424906aad36fb716bffb19
Merge: 77731b6 516ea18
Author: Jamie Nguyen <jamie at tomoyolinux.co.uk>
Date:   Sun Mar 4 16:41:22 2012 +0000

    Merge branch 'master' into f17

 nginx.service |    2 +-
 nginx.spec    |    5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)
---