merge of 6cf672d4e400649f3cbee2deb0da6edbeb759b88
authorDavid Karlstrom <daka@thg.se>
Sat, 20 Aug 2005 15:13:04 +0000 (15:13 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 20 Aug 2005 15:13:04 +0000 (15:13 +0000)
commit0275e7a1c26e95e0208c7e8f920b091dd08d6d3e
tree7dc5237322becc70ab2fa003331ad65a2d8cb9b2
parent3dd224d85887d70de9f54254d01e0b59312e9740
parentdcfe3eb461ab5405aa49bdcd5dc2b5b40110d8d7
merge of 6cf672d4e400649f3cbee2deb0da6edbeb759b88
     and d4664c4ade4053d4a0c57bb5bc4e78b846e3dec7