merges to osmo-bsc master

Hey guys, I'm a bit disappointed that I see more merges to osmo-bsc master that tweak MGCP and codec preferences, moving things around files and so on. Please please do not merge this kind of stuff now, I really cannot use any of that while I'm turning insane to finally get the osmo-bsc refactoring out of the door. It's really mean to load merge conflicts on top of that. If fixes really need quick merging, please do everything in your might to AVOID moving functions around and changing file names. That's ... yeah, you get the picture. What is also more than welcome is to work on the branch tip of neels/inter_bsc_ho and apply cosmetic moves to that. Just please not between current master and the refactoring. (And to test that branch would also be welcome, if time permits.) Another alternative is to *talk* to me. Many thanks. ~N