merge of 8bfbc13386e9803228f6e1221669b7cb6a379c18
authorRod Whitby <rod@whitby.id.au>
Sun, 30 Oct 2005 00:16:40 +0000 (00:16 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 30 Oct 2005 00:16:40 +0000 (00:16 +0000)
commite0459172b694c509094b311c34359b660fd50caf
tree46d2be0ea9b623e05ace3f9cabb4dbc61a1fb8a2
parentf65b1c55cc05fb43463d7e1c9925de56b87bda27
parentde37cab1dfac476a934ffb49cb711e851aa45191
merge of 8bfbc13386e9803228f6e1221669b7cb6a379c18
     and ee91eab40e16fd26e3a706434e40d97953ccc457