Merge branch 'master' into release
authorhudson <hudson@samsung.com>
Thu, 22 Dec 2011 12:23:36 +0000 (21:23 +0900)
committerhudson <hudson@samsung.com>
Thu, 22 Dec 2011 12:23:36 +0000 (21:23 +0900)

Trivial merge