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

[Jamie Nguyen]

commit f1b33cfde625e4db6ba886ee76dda17b76175dcd
Merge: 359b6a5 daa4706
Author: Jamie Nguyen <jamie at tomoyolinux.co.uk>
Date:   Thu Mar 15 21:20:06 2012 +0000

    Merge branch 'f16' into f15

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