Merge branch 'master' into release
authorhudson <hudson@samsung.com>
Mon, 19 Dec 2011 12:15:01 +0000 (21:15 +0900)
committerhudson <hudson@samsung.com>
Mon, 19 Dec 2011 12:15:01 +0000 (21:15 +0900)

Trivial merge