Merge branch 'master' into release
authorhudson <hudson@samsung.com>
Wed, 14 Dec 2011 05:39:02 +0000 (14:39 +0900)
committerhudson <hudson@samsung.com>
Wed, 14 Dec 2011 05:39:02 +0000 (14:39 +0900)

Trivial merge