Merge branch 'master' into release
authorhudson <hudson@samsung.com>
Fri, 16 Dec 2011 13:14:40 +0000 (22:14 +0900)
committerhudson <hudson@samsung.com>
Fri, 16 Dec 2011 13:14:40 +0000 (22:14 +0900)

Trivial merge