merge of '5d6540ad3653bf2e438ca73517f7b9c874d06cc1'
authorMustafa Yuecel <yuecelm@ee.ethz.ch>
Fri, 25 Aug 2006 16:18:23 +0000 (16:18 +0000)
committerMustafa Yuecel <yuecelm@ee.ethz.ch>
Fri, 25 Aug 2006 16:18:23 +0000 (16:18 +0000)
     and 'b04a3501f1bd7897a8ed9eed9f0796e1e96dd1bf'


Trivial merge