Merge branch 'master' into release
authorhudson <hudson@samsung.com>
Wed, 7 Dec 2011 20:38:36 +0000 (05:38 +0900)
committerhudson <hudson@samsung.com>
Wed, 7 Dec 2011 20:38:36 +0000 (05:38 +0900)

Trivial merge