merge of 745f481b6c45cddfd77a92cad262092f8ce0dd05
authorMichael Lauer <mickey@vanille-media.de>
Sun, 7 May 2006 12:08:50 +0000 (12:08 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 7 May 2006 12:08:50 +0000 (12:08 +0000)
     and 8aa7d9ca8a4bc9f72eab0dc5bb4b93ffc8204e55


Trivial merge