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

[Jamie Nguyen]

commit 735b1203607d5b3ef80905f871640bccaf778a08
Merge: 044f0c9 7137e03
Author: Jamie Nguyen <j at jamielinux.com>
Date:   Tue Dec 11 17:55:25 2012 +0000

    Merge branch 'master' into f18
    
    Conflicts:
    	.gitignore
    	nginx.spec
    	sources

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