Merge branch 'master' into release
authorhudson <hudson@samsung.com>
Tue, 3 Jan 2012 07:22:39 +0000 (16:22 +0900)
committerhudson <hudson@samsung.com>
Tue, 3 Jan 2012 07:22:39 +0000 (16:22 +0900)

Trivial merge