merge of 'a313b4ef183dbf50cfe3226664e5f17033c03dc2'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Fri, 30 Mar 2007 10:12:59 +0000 (10:12 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Fri, 30 Mar 2007 10:12:59 +0000 (10:12 +0000)
commitf8031d469e07891f26db9f31c09e0fe9e4eaa8d1
tree7d8201b147a9cac8d58e3fae0efdd22d4db79019
parentd87bbf6f9895b64a042a6cd814b2c997383ecffd
parentb0ee85f4869abd55db07bebedcb7dd0d7798b06f
Merge ... 'a313b4ef183dbf50cfe3226664e5f17033c03dc2'
     and 'add776e24ed7d1a9c84f1664e221cb0970fa98ff'