Merge branch 'master' into release
authorhudson <hudson@samsung.com>
Mon, 19 Dec 2011 10:34:16 +0000 (19:34 +0900)
committerhudson <hudson@samsung.com>
Mon, 19 Dec 2011 10:34:16 +0000 (19:34 +0900)
commit0dda5504bea5997a28a47fa7711f37b33323caff
tree146ef7095045fdf6e7a923bb79efb1f087702ecc
parentdd77e897a87ca18fb648d8a8d75e4db3092177a8
parent566e86428093f18b0f2f1c6961bf1d3416e27589
Merge branch 'master' into release