Merge remote-tracking branch 'origin/upstream'
authorMike McCormack <mj.mccormack@samsung.com>
Wed, 16 Nov 2011 23:11:43 +0000 (08:11 +0900)
committerMike McCormack <mj.mccormack@samsung.com>
Wed, 16 Nov 2011 23:11:43 +0000 (08:11 +0900)

Trivial merge