Merge branch 'master' into release
authorhudson <hudson@samsung.com>
Thu, 8 Dec 2011 07:33:51 +0000 (16:33 +0900)
committerhudson <hudson@samsung.com>
Thu, 8 Dec 2011 07:33:51 +0000 (16:33 +0900)

Trivial merge