Merge branch 'master' into release
authorhudson <hudson@samsung.com>
Fri, 30 Dec 2011 09:11:22 +0000 (18:11 +0900)
committerhudson <hudson@samsung.com>
Fri, 30 Dec 2011 09:11:22 +0000 (18:11 +0900)

Trivial merge