Merge branch 'master' into release
authorhudson <hudson@samsung.com>
Tue, 20 Dec 2011 01:34:43 +0000 (10:34 +0900)
committerhudson <hudson@samsung.com>
Tue, 20 Dec 2011 01:34:43 +0000 (10:34 +0900)

Trivial merge