Code review comment for lp:~miroslavr256/widelands/buildcat-fixes

I don't know what you ean by merge commits - we merge trunk into branches all the time if that is what you mean.

Changing the headers is not a problem. I'll try to have a look at the code next week :)