Merge remote-tracking branch 'origin/upstream'
authorMike McCormack <mj.mccormack@samsung.com>
Wed, 5 Oct 2011 07:41:44 +0000 (16:41 +0900)
committerMike McCormack <mj.mccormack@samsung.com>
Wed, 5 Oct 2011 07:41:44 +0000 (16:41 +0900)

Trivial merge