Merge branch 'master' into release
authorhudson <hudson@samsung.com>
Wed, 14 Dec 2011 01:38:58 +0000 (10:38 +0900)
committerhudson <hudson@samsung.com>
Wed, 14 Dec 2011 01:38:58 +0000 (10:38 +0900)

Trivial merge