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

Trivial merge