Merge branch 'master' into release
authorhudson <hudson@samsung.com>
Mon, 12 Dec 2011 05:36:11 +0000 (14:36 +0900)
committerhudson <hudson@samsung.com>
Mon, 12 Dec 2011 05:36:11 +0000 (14:36 +0900)

Trivial merge