Merge branch 'master' into release
authorhudson <hudson@samsung.com>
Thu, 8 Sep 2011 10:04:31 +0000 (19:04 +0900)
committerhudson <hudson@samsung.com>
Thu, 8 Sep 2011 10:04:31 +0000 (19:04 +0900)

Trivial merge