Merge branch 'master' into release
authorhudson <hudson@samsung.com>
Wed, 7 Dec 2011 19:52:16 +0000 (04:52 +0900)
committerhudson <hudson@samsung.com>
Wed, 7 Dec 2011 19:52:16 +0000 (04:52 +0900)

Trivial merge