Merge branch 'master' into release
authorhudson <hudson@samsung.com>
Thu, 1 Dec 2011 05:55:00 +0000 (14:55 +0900)
committerhudson <hudson@samsung.com>
Thu, 1 Dec 2011 05:55:00 +0000 (14:55 +0900)

Trivial merge