Merge branch 'master' into release
authorhudson <hudson@samsung.com>
Thu, 15 Dec 2011 09:37:14 +0000 (18:37 +0900)
committerhudson <hudson@samsung.com>
Thu, 15 Dec 2011 09:37:14 +0000 (18:37 +0900)

Trivial merge