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)
     and '788d9bed02362e1ac0eb5260f8bbe09e52676cf8'


Trivial merge