merge of 42c2ebb949d65887341284ca09de93294c715b77
authorKoen Kooi <koen@openembedded.org>
Sun, 4 Sep 2005 20:19:21 +0000 (20:19 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 4 Sep 2005 20:19:21 +0000 (20:19 +0000)
commit0acb94784151b5776fa5fdc267441611a583668a
tree162bfd978bb4f417e1d4d789f40f14b92b05b0e6
parentcaa73dbb000b08b6d0dde1782133000ce211a63d
parentfcf2bc353dc7fe5d9ff9a1b52e64a2870e89d691
merge of 42c2ebb949d65887341284ca09de93294c715b77
     and edffa7178fc26b4b3fa5f13fc20d230d47136d23