merge of 33094c93cc3c50c3b08c85d8a1e01dc7900e63d9
authorRod Whitby <rod@whitby.id.au>
Sun, 15 Jan 2006 00:00:21 +0000 (00:00 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 15 Jan 2006 00:00:21 +0000 (00:00 +0000)
commit4c0fea3593bf3615b06250162e53832085e78b9d
tree673a278b3f65c41109d461dcde106b3ac8bbe13b
parent6103cfc590628d7c2c9a52eb1fbffcf64b1983fe
parent17fe84319301fcf629f5b47f13053e41919e98b5
merge of 33094c93cc3c50c3b08c85d8a1e01dc7900e63d9
     and d2073a994ce87b85b8e036caa8b742bd38353abc