Merge remote-tracking branch 'origin/upstream'
authorMike McCormack <mj.mccormack@samsung.com>
Tue, 15 Nov 2011 09:01:00 +0000 (18:01 +0900)
committerMike McCormack <mj.mccormack@samsung.com>
Tue, 15 Nov 2011 09:01:00 +0000 (18:01 +0900)

Trivial merge