Merge branch 'upstream'
authorMike McCormack <mj.mccormack@samsung.com>
Wed, 5 Oct 2011 00:36:12 +0000 (09:36 +0900)
committerMike McCormack <mj.mccormack@samsung.com>
Wed, 5 Oct 2011 00:36:12 +0000 (09:36 +0900)

Trivial merge