From ab3f5d3d32bc27f31ed07b12c9b89da93717e40d Mon Sep 17 00:00:00 2001
From: Robin Liao <rliao@riotgames.com>
Date: Mon, 1 Aug 2011 16:56:04 -0700
Subject: [PATCH] Merge branch 'master', remote-tracking branch
 'upstream/master'