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

[Jamie Nguyen]

commit c8528e88213cfcbba80dc6f081590250ab68df98
Merge: b4063cc c89e267
Author: Jamie Nguyen <jamie at tomoyolinux.co.uk>
Date:   Sun Mar 4 17:59:13 2012 +0000

    Merge branch 'master' into f17

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