Merge branch 'master' into release
authorhudson <hudson@samsung.com>
Tue, 13 Dec 2011 04:35:23 +0000 (13:35 +0900)
committerhudson <hudson@samsung.com>
Tue, 13 Dec 2011 04:35:23 +0000 (13:35 +0900)

Trivial merge