Merge branch 'upstream'
authorMike McCormack <mj.mccormack@samsung.com>
Tue, 2 Aug 2011 09:25:03 +0000 (18:25 +0900)
committerMike McCormack <mj.mccormack@samsung.com>
Tue, 2 Aug 2011 09:25:03 +0000 (18:25 +0900)

Trivial merge