Merge branch 'master' into release
authorhudson <hudson@samsung.com>
Sat, 7 Jan 2012 10:44:02 +0000 (19:44 +0900)
committerhudson <hudson@samsung.com>
Sat, 7 Jan 2012 10:44:02 +0000 (19:44 +0900)

Trivial merge