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

[Jamie Nguyen]

commit eea47d52749162cad7baa170c72063ed7cb6ea2d
Merge: 64543c8 04fa560
Author: Jamie Nguyen <j at jamielinux.com>
Date:   Wed Jan 30 07:31:41 2013 +0000

    Merge branch 'master' into f18

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