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

Trivial merge