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

Trivial merge