Merge branch 'master' into release
authorhudson <hudson@samsung.com>
Tue, 23 Aug 2011 19:02:57 +0000 (04:02 +0900)
committerhudson <hudson@samsung.com>
Tue, 23 Aug 2011 19:02:57 +0000 (04:02 +0900)

Trivial merge