Merge branch 'master' into release
authorhudson <hudson@samsung.com>
Tue, 20 Dec 2011 06:54:46 +0000 (15:54 +0900)
committerhudson <hudson@samsung.com>
Tue, 20 Dec 2011 06:54:46 +0000 (15:54 +0900)

Trivial merge