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

Trivial merge