Merge branch 'master' into release
authorhudson <hudson@samsung.com>
Mon, 5 Dec 2011 10:23:46 +0000 (19:23 +0900)
committerhudson <hudson@samsung.com>
Mon, 5 Dec 2011 10:23:46 +0000 (19:23 +0900)

Trivial merge