Merge branch 'master' into release
authorhudson <hudson@samsung.com>
Wed, 7 Dec 2011 06:53:34 +0000 (15:53 +0900)
committerhudson <hudson@samsung.com>
Wed, 7 Dec 2011 06:53:34 +0000 (15:53 +0900)

Trivial merge