Merge branch 'master' into release
authorhudon <hudson@samsung.com>
Tue, 18 Oct 2011 11:27:24 +0000 (20:27 +0900)
committerhudon <hudson@samsung.com>
Tue, 18 Oct 2011 11:27:24 +0000 (20:27 +0900)

Trivial merge