Merge remote-tracking branch 'origin/upstream'
authorMike McCormack <mj.mccormack@samsung.com>
Thu, 3 Nov 2011 00:32:20 +0000 (09:32 +0900)
committerMike McCormack <mj.mccormack@samsung.com>
Thu, 3 Nov 2011 00:32:20 +0000 (09:32 +0900)

Trivial merge