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

Trivial merge