Merge branch 'master' into release
authorhudson <hudson@samsung.com>
Mon, 5 Dec 2011 11:51:59 +0000 (20:51 +0900)
committerhudson <hudson@samsung.com>
Mon, 5 Dec 2011 11:51:59 +0000 (20:51 +0900)

Trivial merge