Merge branch 'master' into release
authorhudson <hudson@samsung.com>
Fri, 6 Jan 2012 08:54:54 +0000 (17:54 +0900)
committerhudson <hudson@samsung.com>
Fri, 6 Jan 2012 08:54:54 +0000 (17:54 +0900)

Trivial merge