Merge branch 'master' into release
authorhudson <hudson@samsung.com>
Tue, 29 Nov 2011 05:44:47 +0000 (14:44 +0900)
committerhudson <hudson@samsung.com>
Tue, 29 Nov 2011 05:44:47 +0000 (14:44 +0900)

Trivial merge