Merge with for-junio
commitc0de283360559e380ae481548facf3b9ddf0f5c4
authorJohannes Sixt <johannes.sixt@telecom.at>
Wed, 24 Jan 2007 09:46:33 +0000 (24 10:46 +0100)
committerJohannes Sixt <johannes.sixt@telecom.at>
Wed, 24 Jan 2007 09:46:33 +0000 (24 10:46 +0100)
treeca4c0c35c2ad3c2dbcb304f73f93ebc93fbdcf06
parent18bf4a4beafb904ab0ee2fcb3a59b7d95f42c9ef
parent4feaf032d3c2e144e0dca61e004481164dace56a
Merge with for-junio
refs.c