Merge branch 'master' into release
authorhudson <hudson@samsung.com>
Sat, 10 Dec 2011 08:03:44 +0000 (17:03 +0900)
committerhudson <hudson@samsung.com>
Sat, 10 Dec 2011 08:03:44 +0000 (17:03 +0900)

Trivial merge