merge of '479705830aaddad1ebb7bf7f36e492b5587043a0'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Thu, 11 Jan 2007 19:02:37 +0000 (19:02 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Thu, 11 Jan 2007 19:02:37 +0000 (19:02 +0000)
commitbb923469dd8964f9d34355d78072e17b7be5f659
tree63ae7f0c1e5ded97319f3f959aaeb7ba72b04f2c
parent0d6071faa667407505bec2d35d9b7f533b62f7cb
parent3b01a13a70b1c071f29a0ba70f26dbdb335dced9
Merge ... '479705830aaddad1ebb7bf7f36e492b5587043a0'
     and 'c4bca390acd8e11f41e5c2fa6f21837f7f6b70ae'