Merge branch 'master' into release
authorhudson <hudson@samsung.com>
Fri, 16 Dec 2011 12:41:23 +0000 (21:41 +0900)
committerhudson <hudson@samsung.com>
Fri, 16 Dec 2011 12:41:23 +0000 (21:41 +0900)

Trivial merge