merge of 'aaafb999d11846eacd606047f3cddf7a583a9e0c'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Thu, 21 Jun 2007 16:08:16 +0000 (16:08 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Thu, 21 Jun 2007 16:08:16 +0000 (16:08 +0000)
commitba68b5b60c6b212df3ac763a9283462564403330
tree976a4391a5e19d6835f314598ed1cb24fa3a4c09
parentfa1cb20696128f0b580187f779aac90b879456f7
parent07903f2bd73ad78932437c6dcfb45c25f722fc57
Merge ... 'aaafb999d11846eacd606047f3cddf7a583a9e0c'
     and 'b0652ec03153efab79c1e4fedf9f6847d4695672'