Merge branch 'master' into release
authorhudson <hudson@samsung.com>
Fri, 16 Dec 2011 05:34:49 +0000 (14:34 +0900)
committerhudson <hudson@samsung.com>
Fri, 16 Dec 2011 05:34:49 +0000 (14:34 +0900)

Trivial merge