merge of '59341f601c1006b473e6599023cd3870fec6ff99'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 22 Feb 2007 15:19:49 +0000 (15:19 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 22 Feb 2007 15:19:49 +0000 (15:19 +0000)
commit05a838f9c50b866fb58e5ddb4a7fa94bb594aefd
treefd860b6eebd2b1826d6651170475dfb1b69bca6b
parent1dae69bdb0d41e96655d849de94b85d4fd6ccfda
parentd3496eaadf50d896a6fd89fed51a4f6a50e508f6
Merge ... '59341f601c1006b473e6599023cd3870fec6ff99'
     and '7b8ecf841cab8930e619a7d8366b45d045d72c16'