merge of 42d69359113ca4019c6288abe81bcb0e233a958a
authorDavid Karlstrom <daka@thg.se>
Sun, 21 Aug 2005 17:28:10 +0000 (17:28 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 21 Aug 2005 17:28:10 +0000 (17:28 +0000)
commitb17d0ea38e2275edb6c5b6b36940e406f5661562
tree343d9aac76d2365de9c0c774e1abcc94f06455a0
parent58ead9156830c4ab411da9a870ea2bf26725a8a4
parent20e87349126957330957f58e05f24890fd01123a
merge of 42d69359113ca4019c6288abe81bcb0e233a958a
     and 6ae384bbffeb51d8f91602afdfe7f88512e52854