Merge branch 'master' into release
authorhudson <hudson@samsung.com>
Wed, 14 Dec 2011 01:39:12 +0000 (10:39 +0900)
committerhudson <hudson@samsung.com>
Wed, 14 Dec 2011 01:39:12 +0000 (10:39 +0900)

Trivial merge