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

[Jamie Nguyen]

commit 77731b6ace53883fb610bab8c003bd7b43b22462
Merge: 8d1e271 a28f6d6
Author: Jamie Nguyen <jamie at tomoyolinux.co.uk>
Date:   Sun Mar 4 16:23:52 2012 +0000

    Merge branch 'master' into f17

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