Merge branch 'master' into release
authorhudon <hudson@samsung.com>
Fri, 7 Oct 2011 07:03:43 +0000 (16:03 +0900)
committerhudon <hudson@samsung.com>
Fri, 7 Oct 2011 07:03:43 +0000 (16:03 +0900)

Trivial merge