From: zhijun Ren <ren.zhijun_at_oracle.com>
Date: Wed, 17 Dec 2014 15:08:55 +0800

Hi Ed and Manfred,

Please help to review the code that has been attached to the bug, the
change is based on trunk.

BR,
Zhijun