Merge branch 'master' into release
authorhudson <hudson@samsung.com>
Mon, 12 Dec 2011 04:24:03 +0000 (13:24 +0900)
committerhudson <hudson@samsung.com>
Mon, 12 Dec 2011 04:24:03 +0000 (13:24 +0900)

Trivial merge