Merge branch 'master' into release
authorhudson <hudson@samsung.com>
Thu, 15 Dec 2011 09:37:14 +0000 (18:37 +0900)
committerhudson <hudson@samsung.com>
Thu, 15 Dec 2011 09:37:14 +0000 (18:37 +0900)
commitb8355274f6505ce4c4172e82905a9798c09cfe57
tree7e021d0cf309feb512bc4eca474de34c091f6a9c
parent614034f7c99086e956206f32722b9a9d257954c4
parent60848d3128572fa9174f2b4ee2f4c76d5bd016c2
Merge branch 'master' into release