Merge branch 'master' into release
authorhudon <hudson@samsung.com>
Fri, 9 Sep 2011 08:02:32 +0000 (17:02 +0900)
committerhudon <hudson@samsung.com>
Fri, 9 Sep 2011 08:02:32 +0000 (17:02 +0900)

Trivial merge