Merge branch 'master' into release
authorhudson <hudson@samsung.com>
Wed, 4 Jan 2012 10:23:26 +0000 (19:23 +0900)
committerhudson <hudson@samsung.com>
Wed, 4 Jan 2012 10:23:26 +0000 (19:23 +0900)

Trivial merge