Merge branch 'master' into release
authorhudson <hudson@samsung.com>
Wed, 28 Dec 2011 02:35:34 +0000 (11:35 +0900)
committerhudson <hudson@samsung.com>
Wed, 28 Dec 2011 02:35:34 +0000 (11:35 +0900)

Trivial merge