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

[Jamie Nguyen]

commit 32338dbd1536bb4ecf705766417545e37f707ecf
Merge: a7ecbde 83f14e4
Author: Jamie Nguyen <jamie at tomoyolinux.co.uk>
Date:   Tue Mar 6 08:34:58 2012 +0000

    Merge branch 'master' into f17

 .gitignore |    1 +
 nginx.spec |   12 ++++++++----
 sources    |    2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)
---