Merge branch 'master' into release
authorhudson <hudson@samsung.com>
Thu, 15 Dec 2011 10:01:54 +0000 (19:01 +0900)
committerhudson <hudson@samsung.com>
Thu, 15 Dec 2011 10:01:54 +0000 (19:01 +0900)

Trivial merge