Merge branch 'master' into release
authorhudson <hudson@samsung.com>
Mon, 19 Dec 2011 07:54:51 +0000 (16:54 +0900)
committerhudson <hudson@samsung.com>
Mon, 19 Dec 2011 07:54:51 +0000 (16:54 +0900)
commit4ecc8d69840beff91987694219ec2da7110b208c
treee7ca38de7e91abc272eb8d990a82fadc28df157b
parentd6cb3570a3e2625ff3acfd8f32e0aa8db30d9ad7
parent1b08f69e3fc00dc345c95fc608d2477d238e42f4
Merge branch 'master' into release