Merge branch 'master' into release
authorhudson <hudson@samsung.com>
Thu, 1 Dec 2011 02:40:20 +0000 (11:40 +0900)
committerhudson <hudson@samsung.com>
Thu, 1 Dec 2011 02:40:20 +0000 (11:40 +0900)

Trivial merge