merge of '3c8e3d68719358813ee74a6de4f4a724fd827bd0'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 10 Sep 2006 09:07:19 +0000 (09:07 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 10 Sep 2006 09:07:19 +0000 (09:07 +0000)
commiteda19a83467a5e0155fe74056d4eea072edfcfc3
tree491e09b1f816a06f0561b9c0dd3e26fa6b269075
parent62a86cd1cae6025b0234889119507af43f5bc24a
parenta0fa35a8ea6a6ad72c8b71b571bbdddb53b66fc9
Merge ... '3c8e3d68719358813ee74a6de4f4a724fd827bd0'
     and '9069334d89f0643dbe7a56f63eb0ba9aabaf2a6a'