Merge branch 'master' into release
authorhudon <hudson@samsung.com>
Fri, 14 Oct 2011 04:47:23 +0000 (13:47 +0900)
committerhudon <hudson@samsung.com>
Fri, 14 Oct 2011 04:47:23 +0000 (13:47 +0900)

Trivial merge