Merge branch 'master' into release
authorhudon <hudson@samsung.com>
Fri, 9 Sep 2011 03:25:58 +0000 (12:25 +0900)
committerhudon <hudson@samsung.com>
Fri, 9 Sep 2011 03:25:58 +0000 (12:25 +0900)

Trivial merge