Auto-merge from mysq-5.1-security.

This commit is contained in:
Ramil Kalimullin 2011-08-09 12:50:55 +04:00
commit 0215807a2a

Diff content is not available