Repository : ssh://git@open-mesh.org/doc

On branches: batman-adv-doc,master

commit 1f24245fe76a35d00dd76b7422de006758b76cf0 Merge: b77a9ee1 a4ea3344 Author: Marek Lindner lindner_marek@yahoo.de Date: Sun Apr 12 01:03:28 2009 +0800

Merge branch 'master' of gitorious:batman-adv-doc/mainline

1f24245fe76a35d00dd76b7422de006758b76cf0 batman_iv.docbook | 12 ++++++++++-- images/Makefile | 2 +- images/asym_link2.dia | 8 ++++---- images/{tq_prop_calc.tex => asym_penalty_formula.tex} | 2 +- 4 files changed, 16 insertions(+), 8 deletions(-)