merge of bb8a3b34208ff63b05eb2b6f77183737b9a38c6a
authorRod Whitby <rod@whitby.id.au>
Tue, 6 Dec 2005 16:10:21 +0000 (16:10 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 6 Dec 2005 16:10:21 +0000 (16:10 +0000)
commit2031ed0948c018ac1d1c0e33eb1e76d2fccb8b38
treea49f573eda5605d67c989da3d8ed29192caafa42
parentaa467290637b8d7ac2401d2b89f13ac5c04eef2f
parent4cff548ae08c8724bf27ea62c134c8df99cbde14
merge of bb8a3b34208ff63b05eb2b6f77183737b9a38c6a
     and efe5ba84574e7ae7e86f7fb34cf883a21c2144bb