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

[Jamie Nguyen]

commit 27d2e19db62d93210e6305f173df0a644cafaaa1
Merge: 32338db 4cdcd0c
Author: Jamie Nguyen <jamie at tomoyolinux.co.uk>
Date:   Thu Mar 15 21:08:23 2012 +0000

    Merge branch 'master' into f17

 .gitignore |    3 +--
 nginx.spec |   14 +++++++++-----
 sources    |    2 +-
 3 files changed, 11 insertions(+), 8 deletions(-)
---