Merge branch 'master' into release
authorhudson <hudson@samsung.com>
Thu, 1 Dec 2011 14:00:27 +0000 (23:00 +0900)
committerhudson <hudson@samsung.com>
Thu, 1 Dec 2011 14:00:27 +0000 (23:00 +0900)
commit4be5e42bf3947184e3beab78480eeaaebfd9aee4
tree174e15b3d13c7c02d3b4bd7edea79e3f9def9b42
parent417cc0074041e912479f374d7209913e17e2cb8c
parent26511c7305fd3dfdad8a2c1245fde8eee9bb9794
Merge branch 'master' into release