Merge branch 'master' into release
authorhudson <hudson@samsung.com>
Sat, 3 Dec 2011 11:37:20 +0000 (20:37 +0900)
committerhudson <hudson@samsung.com>
Sat, 3 Dec 2011 11:37:20 +0000 (20:37 +0900)

Trivial merge