Merge branch 'master' into release
authorhudson <hudson@samsung.com>
Thu, 8 Dec 2011 12:12:10 +0000 (21:12 +0900)
committerhudson <hudson@samsung.com>
Thu, 8 Dec 2011 12:12:10 +0000 (21:12 +0900)

Trivial merge