Germany's Merkel pays Putin a prickly visit