tree b95b745d5527be97dc7db31f3a67b6b0547450cd
parent e1d506778994c6f844d60c903d7cdeb2ffc74925
parent 140f6e9b12fcb83d161dc1cd8c5d6972ef86fc7c
author Holger Hans Peter Freyther <zecke@selfish.org> 1267211904 +0100
committer Holger Hans Peter Freyther <zecke@selfish.org> 1267211904 +0100

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