Merge branch 'master' into release
authorhudson <hudson@samsung.com>
Fri, 30 Dec 2011 04:53:36 +0000 (13:53 +0900)
committerhudson <hudson@samsung.com>
Fri, 30 Dec 2011 04:53:36 +0000 (13:53 +0900)

Trivial merge