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

Trivial merge