merge of '09a60ca1c7d8ce93fb27f1180373afc4410945cb'
authorMika Laitio <lamikr@cc.jyu.fi>
Fri, 10 Nov 2006 21:34:26 +0000 (21:34 +0000)
committerMika Laitio <lamikr@cc.jyu.fi>
Fri, 10 Nov 2006 21:34:26 +0000 (21:34 +0000)
commit433adeac1ae77a9f1ecd30521eea6dd483b29bcf
treefbb939ab3d93d53e17c5d53766ed80ee7421c58b
parent4ad69783516e6eb5166d3af1227f8ecb6992a583
parent8b94cdd44b58e71d003d34f2e2f0a8fa1bfe0db6
Merge ... '09a60ca1c7d8ce93fb27f1180373afc4410945cb'
     and '788d9bed02362e1ac0eb5260f8bbe09e52676cf8'