merged
sasha@mysql.sashanet.com authored
c0f87c83