Merge branch 'master' into release
authorhudson <hudson@samsung.com>
Thu, 5 Jan 2012 06:33:35 +0000 (15:33 +0900)
committerhudson <hudson@samsung.com>
Thu, 5 Jan 2012 06:33:35 +0000 (15:33 +0900)

Trivial merge