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

Trivial merge