2011-06-23 Yao Qi <yao@codesourcery.com>