Merge branch 'devel'
authorAndreas Unterkircher <unki@netshadow.at>
Sun, 20 Jan 2008 15:52:59 +0000 (16:52 +0100)
committerAndreas Unterkircher <unki@netshadow.at>
Sun, 20 Jan 2008 15:52:59 +0000 (16:52 +0100)
commit7e6df6ed675904f2a5a208cb23d771fee43f0bb6
tree1f1399d615dab91881d5fb45fa607ee28bf2f285
parentaf297e166b77efb1746f1d396b404102e0f89e15
parentc0c134e5d232d5ec11e367b053972d87a0402216
Merge branch 'devel'