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

Trivial merge