Merge branch 'master' into release
authorhudson <hudson@samsung.com>
Fri, 2 Dec 2011 03:10:38 +0000 (12:10 +0900)
committerhudson <hudson@samsung.com>
Fri, 2 Dec 2011 03:10:38 +0000 (12:10 +0900)

Trivial merge