Merge branch 'master' into release
authorhudson <hudson@samsung.com>
Wed, 14 Dec 2011 07:14:16 +0000 (16:14 +0900)
committerhudson <hudson@samsung.com>
Wed, 14 Dec 2011 07:14:16 +0000 (16:14 +0900)
commit3966818605d296b34e1690af24a1164c9bc6e308
tree4b9611bf4d3e6b49fde130d1cdafa4361973970f
parentc51f20fbcfe563a93f3e87a435fc3899094f68a8
parent1ce6ab9d248dc8dce3aaa0355a732f6096eff7ca
Merge branch 'master' into release