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)
commitc0d29ea51fe686bd32573f7bab1622758520b32c
tree55924f8fb22c795d9623ec9b9ea2614e3f6e8f47
parent8ededc2864b7161748351a952acadeadc048c974
parentc0d6211841a0da37a2e92ca603630fee633732bf
merge of 745f481b6c45cddfd77a92cad262092f8ce0dd05
     and 8aa7d9ca8a4bc9f72eab0dc5bb4b93ffc8204e55