Merge branch 'master' into release
authorhudon <hudson@samsung.com>
Thu, 13 Oct 2011 08:23:41 +0000 (17:23 +0900)
committerhudon <hudson@samsung.com>
Thu, 13 Oct 2011 08:23:41 +0000 (17:23 +0900)

Trivial merge