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

[Jamie Nguyen]

commit f331aa53d3c21a6ce904316a78a97ceaa76db05d
Merge: f1b33cf c615895
Author: Jamie Nguyen <jamie at tomoyolinux.co.uk>
Date:   Thu Apr 19 17:46:48 2012 +0100

    Merge branch 'f16' into f15

 .gitignore |    2 +-
 nginx.spec |    6 +++++-
 sources    |    2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)
---