Merge branch 'master' into release
authorhudson <hudson@samsung.com>
Fri, 26 Aug 2011 10:07:59 +0000 (19:07 +0900)
committerhudson <hudson@samsung.com>
Fri, 26 Aug 2011 10:07:59 +0000 (19:07 +0900)
commit67ba1915b387b3f5ca56ebdaccd0254f905ce5ae
tree074935515305a23a9db07ac65e0087452e4025de
parent8ae40b145ea0e3dfb0dcd0e8e4393acbe9e07c40
parent289476e97757145c2878fb4c0b7a6c306f7bdce6
Merge branch 'master' into release