tree 35d0086221a12b5c4c1f3c96bbe7bcf3690377bb
parent e95daf19258999a00b8bea5247ee21603941b639
parent 52b4abdcb351830f5493a50c4181ef3947f3feab
author Harald Welte <laforge@gnumonks.org> 1269490524 +0800
committer Holger Hans Peter Freyther <zecke@selfish.org> 1269576927 +0100

Merge commit '52b4abdcb351830f5493a50c4181ef3947f3feab'