Merge branch 'master' into release
authorhudson <hudson@samsung.com>
Tue, 27 Dec 2011 09:33:16 +0000 (18:33 +0900)
committerhudson <hudson@samsung.com>
Tue, 27 Dec 2011 09:33:16 +0000 (18:33 +0900)

Trivial merge