The following commit has been merged in the next branch: commit da115ee995f5f3339fd775a4c794f77640baff4b Merge: f88628875f6c34d3bbb78d3e72f021290e722ca6 44bb66d56dd8bcbdd9f92bf43280a6b956a65652 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Tue Nov 29 14:39:03 2011 +0800 Merge branch 'next' of git+ssh://batman-git/batman-adv into next -- batman-adv