Merge branch 'master' into release
authorhudson <hudson@samsung.com>
Thu, 1 Dec 2011 14:00:27 +0000 (23:00 +0900)
committerhudson <hudson@samsung.com>
Thu, 1 Dec 2011 14:00:27 +0000 (23:00 +0900)

Trivial merge