Merge branch 'master' into release
authorhudson <hudson@samsung.com>
Wed, 30 Nov 2011 02:35:05 +0000 (11:35 +0900)
committerhudson <hudson@samsung.com>
Wed, 30 Nov 2011 02:35:05 +0000 (11:35 +0900)

Trivial merge