Merge with for-junio.
commit367d1ce33cb15e025208512cec9930d49c8a2eaf
authorJohannes Sixt <johannes.sixt@telecom.at>
Fri, 26 Jan 2007 13:41:50 +0000 (26 14:41 +0100)
committerJohannes Sixt <johannes.sixt@telecom.at>
Fri, 26 Jan 2007 13:41:50 +0000 (26 14:41 +0100)
treee2839ae888bb52fd76e7642202fc6ddaad4dce5f
parent273855b70fd6fcf14a4d77d3bee13bffc22188da
parent8c8bb94f94f1d972c7ffadda4744cf343fac6f34
Merge with for-junio.