tree 7660c92e9febfb47a5e3b70f95c92aea938e6d27
parent 72267f01fdfe87ec458378f4b2f1aaa610f7b0f0
parent 35a939463eee58492c88cbe7531288237cdcf454
author Harald Welte <laforge@gnumonks.org> 1272716843 +0200
committer Harald Welte <laforge@gnumonks.org> 1272716843 +0200

Merge commit '35a939463eee58492c88cbe7531288237cdcf454'