merge of '04f5cc86d8508c3838a5112313a7db80201c4039'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Fri, 25 May 2007 11:13:30 +0000 (11:13 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Fri, 25 May 2007 11:13:30 +0000 (11:13 +0000)
commit4e37786255e4555d70c6e4f00b259d16921b3094
tree60941011571610f210c64e7e573131640ce71d33
parent21c51afaddcefad16f574c801ae94f509c011593
parentf8c999dcef86b3deb0be982cbed538010b252204
Merge ... '04f5cc86d8508c3838a5112313a7db80201c4039'
     and 'cb3abb910774efcd3e2446771f196413a524b227'