merged changes between nginx-1.4.5 and nginx-1.4.6
updated CHANGES.*
Merge pull request #416 from cfsego/tengine-2.0.1

merged changes between nginx-1.4.5 and nginx-1.4.6