merge of '16d5c273533926e5a6b915d652e1d39e0ec61c10'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 16 Mar 2008 12:57:55 +0000 (12:57 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 16 Mar 2008 12:57:55 +0000 (12:57 +0000)
commit12cf3e7740c3084127e905fd9b157f1d691b90cd
treeadb7ee52fcec5218f4e3a211953c941d931a9b08
parente5720261f0c09f815a23f6b2c8f0b5c4d9258bf5
parentc25dc0b4bc1d4d98507e613a37d74244b22489c4
Merge ... '16d5c273533926e5a6b915d652e1d39e0ec61c10'
     and 'c4cca98d5a0327e7baca40483e3a196a8f60af95'