Add some compatibility information (r1840964 in trunk) + remove an extra empty line to synch with trunk