merge of 3aa7e8c00e162c64558b2b2bf8171f7887f4725b
authorMichael Lauer <mickey@vanille-media.de>
Thu, 20 Apr 2006 22:56:57 +0000 (22:56 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 20 Apr 2006 22:56:57 +0000 (22:56 +0000)
commit3d3f4dc7c8b47a2cc1a63327273507bce6602024
tree5760517d585a055961bcace9750afe5faf3525b3
parent59477a7a2bd675aa25967cf6851a66f5852932d0
parentca4a4c05edc25c816f4dbb7f20edd53d94a51afd
merge of 3aa7e8c00e162c64558b2b2bf8171f7887f4725b
     and d35a0eeacf900a9c366ef434552e49f6cf777bb7