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

Trivial merge