Merge branch 'master' into release
authorhudson <hudson@samsung.com>
Sat, 3 Dec 2011 13:36:00 +0000 (22:36 +0900)
committerhudson <hudson@samsung.com>
Sat, 3 Dec 2011 13:36:00 +0000 (22:36 +0900)

Trivial merge