Merge branch 'master' into release
authorhudson <hudson@samsung.com>
Mon, 19 Dec 2011 13:14:46 +0000 (22:14 +0900)
committerhudson <hudson@samsung.com>
Mon, 19 Dec 2011 13:14:46 +0000 (22:14 +0900)
commit5824fc1707d7035caf9177c98f2a4a99cc1178d0
treeb5871a5ef00d8689d51fb8453c9a57fe7d2e447b
parentb38877c51f7b6cbd93cd4c9ba6e973be79cfd7c4
parentd6f19dc68fec1a041aceeadf28e56d1e911695f2
Merge branch 'master' into release