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

Trivial merge