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

[Jamie Nguyen]

commit a7ecbded9916889065a53a7256066d896096ae51
Merge: c8528e8 ee9a369
Author: Jamie Nguyen <jamie at tomoyolinux.co.uk>
Date:   Sun Mar 4 20:19:38 2012 +0000

    Merge branch 'master' into f17

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