Merge branch 'master' into release
authorhudson <hudson@samsung.com>
Sun, 11 Dec 2011 07:52:05 +0000 (16:52 +0900)
committerhudson <hudson@samsung.com>
Sun, 11 Dec 2011 07:52:05 +0000 (16:52 +0900)

Trivial merge