Merge remote-tracking branch 'origin/devel'
authorPeng Huang <shawn.p.huang@gmail.com>
Sun, 26 Feb 2012 21:28:40 +0000 (16:28 -0500)
committerPeng Huang <shawn.p.huang@gmail.com>
Sun, 26 Feb 2012 21:29:30 +0000 (16:29 -0500)
TEST=Linux Desktop

Review URL: https://codereview.appspot.com/5517048


Trivial merge