Merge remote-tracking branch 'upstream/master'
authorNghia Ho <nghiaho12@yahoo.com>
Mon, 30 Sep 2013 12:59:29 +0000 (22:59 +1000)
committerNghia Ho <nghiaho12@yahoo.com>
Mon, 30 Sep 2013 12:59:29 +0000 (22:59 +1000)

Trivial merge