Following a meeting with Wen Jiabao, Angela Merkel adopted a surprisingly conciliatory tone with China over alleged dumping of solar panels