tree 1229a0bfb2bb0093dec05959fd4bbfca557d64c9
parent 36ed8cc4c33e3b69bb0f84f1b5b593ae46aff08f
parent 140f6e9b12fcb83d161dc1cd8c5d6972ef86fc7c
author Holger Hans Peter Freyther <zecke@selfish.org> 1267211797 +0100
committer Holger Hans Peter Freyther <zecke@selfish.org> 1267211805 +0100

Merge remote branch 'origin/master' into on-waves/mgcp

Conflicts:
	openbsc/include/openbsc/Makefile.am
	openbsc/src/Makefile.am