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)
     and d2073a994ce87b85b8e036caa8b742bd38353abc


Trivial merge