Merge branch 'master' into release
authorhudson <hudson@samsung.com>
Fri, 6 Jan 2012 01:22:43 +0000 (10:22 +0900)
committerhudson <hudson@samsung.com>
Fri, 6 Jan 2012 01:22:43 +0000 (10:22 +0900)

Trivial merge