merge of 63781da032c43575221c98947e7475e3cb577eba
authorRod Whitby <rod@whitby.id.au>
Sun, 4 Dec 2005 20:00:53 +0000 (20:00 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 4 Dec 2005 20:00:53 +0000 (20:00 +0000)
commiteb72934c0003f40faeceebdca21c4d8de22b0e60
treebd7d5970eda1d92a3cdede4a04587602389e15bd
parentab9464140b9120ec8a0cc5f8ddec50cd7f85bfb4
parent984f0d7238867e3581f016ecbd6930d6ca85e950
merge of 63781da032c43575221c98947e7475e3cb577eba
     and d638a96a479477de2f205d32492408da8c183085