Merge branch 'master' into release
authorhudson <hudson@samsung.com>
Wed, 30 Nov 2011 14:12:23 +0000 (23:12 +0900)
committerhudson <hudson@samsung.com>
Wed, 30 Nov 2011 14:12:23 +0000 (23:12 +0900)

Trivial merge