The following commit has been merged in the maint branch: commit 4424bdeca1d265e81f8bb80a3fac9133fdfc2fa5 Merge: 0642cd27c05ce3bcadcc99cdb0ce6743fcf5c750 2b9a9e274364be840016ca54b132b294af29a9a0 Author: Sven Eckelmann sven@narfation.org Date: Sun Apr 17 15:31:30 2011 +0200

Merge branch 'maint' into next

Conflicts: unicast.c