Merge branch 'master' into release
authorhudson <hudson@samsung.com>
Thu, 1 Dec 2011 13:19:08 +0000 (22:19 +0900)
committerhudson <hudson@samsung.com>
Thu, 1 Dec 2011 13:19:08 +0000 (22:19 +0900)
commit417cc0074041e912479f374d7209913e17e2cb8c
treed5e30066d3a4fe0c200d734771d6dde7654f9d8d
parentf4f727952fcae24d4672e6ade4c6821a52b78111
parent374c8e8c80b7de061d9b67602c996b645d2beef5
Merge branch 'master' into release