Merge branch 'master' into release
authorhudson <hudson@samsung.com>
Tue, 6 Dec 2011 12:32:32 +0000 (21:32 +0900)
committerhudson <hudson@samsung.com>
Tue, 6 Dec 2011 12:32:32 +0000 (21:32 +0900)

Trivial merge