Merge branch 'master' into release
authorhudson <hudson@samsung.com>
Thu, 22 Dec 2011 11:03:39 +0000 (20:03 +0900)
committerhudson <hudson@samsung.com>
Thu, 22 Dec 2011 11:03:39 +0000 (20:03 +0900)

Trivial merge