merge of '30f615c65861e2aeac9bcd31565276b2d5929532'
authorMartin Dietze <di@fh-wedel.de>
Fri, 27 Apr 2007 09:07:30 +0000 (09:07 +0000)
committerMartin Dietze <di@fh-wedel.de>
Fri, 27 Apr 2007 09:07:30 +0000 (09:07 +0000)
commit39bfd6436cea5f93f8d429b650beeb587af0cec8
treea557e0acd2726e7ae8dd8bb7839cdb2331ad19b9
parent3d75046772500b479cbfaa0c199aa7ef069fdc7a
parent21174316f8181c882e6816b923ad2ca81c3778a2
Merge ... '30f615c65861e2aeac9bcd31565276b2d5929532'
     and '3267272c84aca4cba0b1f3d43c934a2d3be05af4'