merge of '49118a4c6035353c0f8cf1aa30297dd36e43241f'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 21 Jul 2008 22:17:38 +0000 (22:17 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 21 Jul 2008 22:17:38 +0000 (22:17 +0000)
commite2251ba07bbb9734905d539ae0e294c08a1ecbde
treedf9020ef445716bef52a20dcbb35309f88c7c311
parentc333977e1cd10d8c40b200b3bbf63c329d629e1e
parente3ee355521dd49a2539326d35cf977794f60880e
Merge ... '49118a4c6035353c0f8cf1aa30297dd36e43241f'
     and '88a5ee5dca39386c6bd95c87a62d1b9c74cd7b32'