merge of '1213079d1b0cc83ff10f588ca0b547a3c117bbe5'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Mon, 11 Jun 2007 18:30:39 +0000 (18:30 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Mon, 11 Jun 2007 18:30:39 +0000 (18:30 +0000)
commita956c7eea7835ea8c4f4816184a935c5cf0adf1e
tree041e3ac1acf7568d0d0ef1e4d4d65ec60aeb0263
parent1145beeec7c2506687fb43dc670cf26f9a6b2611
parentc2ec266706ad8abc8f0d44a22a95bcca2f99ce45
Merge ... '1213079d1b0cc83ff10f588ca0b547a3c117bbe5'
     and 'd82c8a6b3b1ea13ae5fd256983ca2930af242c83'