Merge branch 'master' into release
authorhudson <hudson@samsung.com>
Thu, 1 Dec 2011 05:55:47 +0000 (14:55 +0900)
committerhudson <hudson@samsung.com>
Thu, 1 Dec 2011 05:55:47 +0000 (14:55 +0900)
commitf70e00255264ca31d346bdd59b1c4c75bf7d7d3d
treecee251e7e080aab284ed8f54aa44a9e9c3828ed9
parentc55ea6e4890f972ab2173d34fa7d217a7bd1c7dc
parentea67d7ace3b7936098dcc1cef3f265b641a384f4
Merge branch 'master' into release