Merge branch 'master' into release
authorhudson <hudson@samsung.com>
Fri, 12 Aug 2011 21:01:50 +0000 (06:01 +0900)
committerhudson <hudson@samsung.com>
Fri, 12 Aug 2011 21:01:50 +0000 (06:01 +0900)
commit39566eec1230c7d9895b23bb2d770a87447c4d82
tree64829cfdd4fd06c4bee2328aa4ded03c05a045f6
parent93a712e4c2dcfb544413bd75dedddd6290469c0c
parent170fb8042cd73152ce5d9e836747d7f5fdf7c9c1
Merge branch 'master' into release