Merge branch 'master' into release
authorhudson <hudson@samsung.com>
Tue, 13 Dec 2011 05:14:05 +0000 (14:14 +0900)
committerhudson <hudson@samsung.com>
Tue, 13 Dec 2011 05:14:05 +0000 (14:14 +0900)
commit0b7e16ca3948b6d50abad5b253aeb2b9ea2e9276
treee745caaa5fd3453e264526c3ca198a05afbc968a
parentaacc16c8a2c327ad8521b7417e858d6b6bc58727
parent712a4d2540aedd2e04c80d9d47cb948ffb54f07a
Merge branch 'master' into release