merge of '36099db59bdf61dc5e1f93d3d874817fa38998dd'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 1 Dec 2007 11:33:02 +0000 (11:33 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 1 Dec 2007 11:33:02 +0000 (11:33 +0000)
commit9022f01470fc0feb0d9d2fef846a97dfbe3d85e9
tree5e28e7592fbaa193f9b2dc8fcce9d3b988deaab6
parent74370887caed1bbe586ea1c6a6159240f7c4e182
parent2a5d20dbbf525dd1f9e41fcf05c7291ca3f20861
Merge ... '36099db59bdf61dc5e1f93d3d874817fa38998dd'
     and '82049ea686b5481d9f668eb2bd3c82e3782765e3'