merge of 'dde1602d414f1e9af9fbf46e7fea13cda79bdd4c'
authorKoen Kooi <koen@openembedded.org>
Sat, 2 Aug 2008 20:38:50 +0000 (20:38 +0000)
committerKoen Kooi <koen@openembedded.org>
Sat, 2 Aug 2008 20:38:50 +0000 (20:38 +0000)
commitd88ec88653f437100b83dc74f8d58c884a0b76cb
tree5af26948a03271679f49c5c7a27da0d62169ec48
parent62be5e3f63fce688707089d93f47953ab96df4e6
parent5ec40d0ce1120dba39a90864b8225b4a6f7a96f6
Merge ... 'dde1602d414f1e9af9fbf46e7fea13cda79bdd4c'
     and 'e7877fb9e5d6fe166efa6973b930549f64b7bccb'