tree bca3e6b241762ae97272c9b44f372410f490100a
parent 3cfdb222143d8b1d746e5b807f604afe49853f7d
parent 8426a83908cf8cdfe230d4ea5c443a273ad48aa4
author Harald Welte <laforge@gnumonks.org> 1244808916 +0800
committer Harald Welte <laforge@gnumonks.org> 1244808916 +0800

Merge commit 'origin/master' into mncc-harald