Merge branch 'master' into release
authorhudson <hudson@samsung.com>
Mon, 12 Dec 2011 08:35:25 +0000 (17:35 +0900)
committerhudson <hudson@samsung.com>
Mon, 12 Dec 2011 08:35:25 +0000 (17:35 +0900)

Trivial merge