Merge branch 'master' into release
authorhudson <hudson@samsung.com>
Wed, 14 Dec 2011 05:39:02 +0000 (14:39 +0900)
committerhudson <hudson@samsung.com>
Wed, 14 Dec 2011 05:39:02 +0000 (14:39 +0900)
commit7e9e7dccff26155a10cd90490d3003e9588ce93c
tree85c0bc77ce08a423631d168d59b078b03d2e555a
parentc2fb8eba2cdc5faddcb44fea76dd802b98817f88
parentc8a345c6480e50911084f65873dcf2f52cac3976
Merge branch 'master' into release