Merge branch 'master' into release
authorhudson <hudson@samsung.com>
Thu, 5 Jan 2012 05:14:18 +0000 (14:14 +0900)
committerhudson <hudson@samsung.com>
Thu, 5 Jan 2012 05:14:18 +0000 (14:14 +0900)

Trivial merge