Merge remote-tracking branch 'github/master'

--HG--
extra : convert_revision : svn%3Ac1cd0f6d-1128-48b3-8fbd-b4414931167f/trunk/upgrader%401184
add build.sh. fix a warning in gcc3.

--HG--
extra : convert_revision : svn%3Ac1cd0f6d-1128-48b3-8fbd-b4414931167f/trunk/upgrader%401190
fix build.sh: use a build directory.

--HG--
extra : convert_revision : svn%3Ac1cd0f6d-1128-48b3-8fbd-b4414931167f/trunk/upgrader%401200