Merge branch 'master' into release
authorhudson <hudson@samsung.com>
Fri, 26 Aug 2011 10:07:59 +0000 (19:07 +0900)
committerhudson <hudson@samsung.com>
Fri, 26 Aug 2011 10:07:59 +0000 (19:07 +0900)

Trivial merge