Merge branch 'master' into release
authorhudson <hudson@samsung.com>
Tue, 13 Dec 2011 05:57:21 +0000 (14:57 +0900)
committerhudson <hudson@samsung.com>
Tue, 13 Dec 2011 05:57:21 +0000 (14:57 +0900)

Trivial merge