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

[Jamie Nguyen]

commit 91d1982d18de32ae769794bf4c09a58df119b6aa
Merge: 27d2e19 8a97985
Author: Jamie Nguyen <jamie at tomoyolinux.co.uk>
Date:   Thu Apr 19 17:07:54 2012 +0100

    Merge branch 'master' into f17

 .gitignore |    1 +
 nginx.spec |   15 ++++++++++++---
 sources    |    2 +-
 3 files changed, 14 insertions(+), 4 deletions(-)
---