Merge branch 'master' into release
authorhudson <hudson@samsung.com>
Mon, 9 Jan 2012 07:15:11 +0000 (16:15 +0900)
committerhudson <hudson@samsung.com>
Mon, 9 Jan 2012 07:15:11 +0000 (16:15 +0900)

Trivial merge