Merge remote-tracking branch 'origin/upstream'
authorMike McCormack <mj.mccormack@samsung.com>
Thu, 10 Nov 2011 02:29:05 +0000 (11:29 +0900)
committerMike McCormack <mj.mccormack@samsung.com>
Thu, 10 Nov 2011 02:29:05 +0000 (11:29 +0900)

Trivial merge