merge of 'e9758ef5cc8f5e67a47f0490c6a6040a07926c75'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 5 Sep 2008 13:58:30 +0000 (13:58 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 5 Sep 2008 13:58:30 +0000 (13:58 +0000)
commitdc2b518a1cc4993ca22f5b78f26217915a5ac726
tree94f48d398bd6798067c7644497e4c663b0b423ec
parent104cf2af956a4281fd40acf88ba7891bef32c858
parent7ec0a17ee44c992d5afdd4c5f5e3c10bc7941d22
Merge ... 'e9758ef5cc8f5e67a47f0490c6a6040a07926c75'
     and 'ff89d5794df8f2290ca5cb41d093b3f3083d36c5'