[nginx/f15: 9/9] Merge branch 'f16' into f15

[Jamie Nguyen]

commit 359b6a543d2de7156078657b8a7790e7f35935a8
Merge: a78ec52 7098a82
Author: Jamie Nguyen <jamie at tomoyolinux.co.uk>
Date:   Tue Mar 6 09:04:04 2012 +0000

    Merge branch 'f16' into f15
    
    Conflicts:
    	.gitignore
    	nginx.spec
    	sources

 .gitignore |    1 +
 nginx.spec |  230 +++++++++++++++++++++++++++++++++---------------------------
 sources    |    2 +-
 3 files changed, 128 insertions(+), 105 deletions(-)
---