Merge branch 'master' into release
authorhudson <hudson@samsung.com>
Tue, 27 Dec 2011 03:15:28 +0000 (12:15 +0900)
committerhudson <hudson@samsung.com>
Tue, 27 Dec 2011 03:15:28 +0000 (12:15 +0900)

Trivial merge