merge of 2812814e008a70fdc0a1a8e0c011f96d8f67b57b
authorRod Whitby <rod@whitby.id.au>
Tue, 6 Dec 2005 09:16:14 +0000 (09:16 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 6 Dec 2005 09:16:14 +0000 (09:16 +0000)
commit8a4cbfe4e291a9785b09d788b999be2abf3af4cf
treea49f573eda5605d67c989da3d8ed29192caafa42
parent56e3cfd5bc911e4e47ae00c8bafb785d48b0b7c5
parent3eb8eb685e9192a2d844f071cd121b47b839ddea
merge of 2812814e008a70fdc0a1a8e0c011f96d8f67b57b
     and 477a6d0aedc8faf8f5a2d9cc48fd1855759d7313