Merge branch 'master' into release
authorhudson <hudson@samsung.com>
Fri, 6 Jan 2012 01:22:43 +0000 (10:22 +0900)
committerhudson <hudson@samsung.com>
Fri, 6 Jan 2012 01:22:43 +0000 (10:22 +0900)
commit94acc019e1c1e20a3c2ff1571c9b09ebfabe653a
tree2f3b37fe31c6a02f0cd2a00e6a3a14014a2bf781
parent05135a0372e8e47752954fafcbe3593efa4c7b9b
parent3de7078d99201696c84bb16c8ab74807838e84ac
Merge branch 'master' into release