Merge branch 'master' into release
authorhudson <hudson@samsung.com>
Fri, 23 Dec 2011 01:58:35 +0000 (10:58 +0900)
committerhudson <hudson@samsung.com>
Fri, 23 Dec 2011 01:58:35 +0000 (10:58 +0900)

Trivial merge