Merge branch 'master' into release
authorhudson <hudson@samsung.com>
Fri, 2 Dec 2011 17:13:58 +0000 (02:13 +0900)
committerhudson <hudson@samsung.com>
Fri, 2 Dec 2011 17:13:58 +0000 (02:13 +0900)

Trivial merge