Merge branch 'master' into release
authorhudson <hudson@samsung.com>
Wed, 30 Nov 2011 08:18:50 +0000 (17:18 +0900)
committerhudson <hudson@samsung.com>
Wed, 30 Nov 2011 08:18:50 +0000 (17:18 +0900)

Trivial merge