merge of 21252c4c7a5910613b4ad8bb14547acc75ca2816
authorRod Whitby <rod@whitby.id.au>
Mon, 25 Jul 2005 14:28:22 +0000 (14:28 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 25 Jul 2005 14:28:22 +0000 (14:28 +0000)
commit4039507ee1c010ac8349e962a6fe4a9cfb007394
tree1ae158b765f06849e7865f2077ef80a378fb485d
parenta0e76a8ba8c0ee53382f0a732cd5d0a75ef96d4c
parent2691021c43db14fcfba1a570d08c9532bde3237c
merge of 21252c4c7a5910613b4ad8bb14547acc75ca2816
     and 74528064f70361f71c59f05cc945b3e6dc157aaf