Merge branch 'master' into release
authorhudson <hudson@samsung.com>
Fri, 16 Dec 2011 11:54:57 +0000 (20:54 +0900)
committerhudson <hudson@samsung.com>
Fri, 16 Dec 2011 11:54:57 +0000 (20:54 +0900)

Trivial merge