Merge remote-tracking branch 'upstream/master'
authorNghia Ho <nghiaho12@yahoo.com>
Tue, 1 Oct 2013 09:56:47 +0000 (19:56 +1000)
committerNghia Ho <nghiaho12@yahoo.com>
Tue, 1 Oct 2013 09:56:47 +0000 (19:56 +1000)

Trivial merge