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

[Jamie Nguyen]

commit 71daa2443f7e15dce8ee060fc71bb3362a3b0008
Merge: 966d9b7 48bb9f1
Author: Jamie Nguyen <j at jamielinux.com>
Date:   Wed Dec 19 09:46:49 2012 +0000

    Merge branch 'master' into f18

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