Merge branch 'develop' into release
authorhudson <hudson@samsung.com>
Thu, 12 Jan 2012 07:20:07 +0000 (16:20 +0900)
committerhudson <hudson@samsung.com>
Thu, 12 Jan 2012 07:20:07 +0000 (16:20 +0900)

Trivial merge