Merge branch 'master' into release
authorhudson <hudson@samsung.com>
Wed, 28 Dec 2011 02:52:53 +0000 (11:52 +0900)
committerhudson <hudson@samsung.com>
Wed, 28 Dec 2011 02:52:53 +0000 (11:52 +0900)

Trivial merge