Merge branch 'master' into release
authorhudson <hudson@samsung.com>
Tue, 20 Dec 2011 07:43:57 +0000 (16:43 +0900)
committerhudson <hudson@samsung.com>
Tue, 20 Dec 2011 07:43:57 +0000 (16:43 +0900)

Trivial merge