merge of 19c9c34826590fe580ab36a128422e4fb4c3f6b8
authorMichael Lauer <mickey@vanille-media.de>
Wed, 29 Mar 2006 13:11:26 +0000 (13:11 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 29 Mar 2006 13:11:26 +0000 (13:11 +0000)
commitc157ad6287aa649414f24cbf3170c9e9ed7b41a6
treebd4ecd907be161abfe72457fb2509035ef616326
parenteb3e23a1c96bc6b5738c8aa0ec023b93dc035880
parentb5250ea5c6edf8034c783f1b1e96a8334555ff4a
merge of 19c9c34826590fe580ab36a128422e4fb4c3f6b8
     and f0b12dffc2020212cecbe63130285d68a1897b93