Merge branch 'maint'
commit8e8b01ad9990a913c385239902d910739b3c40f9
authorJohannes Sixt <johannes.sixt@telecom.at>
Sat, 9 Jun 2007 19:54:08 +0000 (9 21:54 +0200)
committerJohannes Sixt <johannes.sixt@telecom.at>
Sat, 9 Jun 2007 19:54:08 +0000 (9 21:54 +0200)
tree3af4d9bcaaf712c00cfa256688a92324f406ae1e
parent090d0ec35ad3e4336222c626bd1dec13120b114b
parent6defea8fbdb006859063abb46e88c0dbe9afd77b
Merge branch 'maint'