Merge branch 'master' into release
authorhudson <hudson@samsung.com>
Wed, 7 Dec 2011 14:11:40 +0000 (23:11 +0900)
committerhudson <hudson@samsung.com>
Wed, 7 Dec 2011 14:11:40 +0000 (23:11 +0900)

Trivial merge