merge of 69f5e6634ad41e14c392c5aca06f4c4516ab4f21
authorMichael Lauer <mickey@vanille-media.de>
Fri, 19 Aug 2005 15:41:09 +0000 (15:41 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 19 Aug 2005 15:41:09 +0000 (15:41 +0000)
commit5bc0fa0024337ba8bec582084cabf6b8171e1aaf
treeba84f7fc5a7bff6d6a27067cb7a7b069e8427326
parent70d68b647d317e0f110bb2a6ece9cf15e4f47fb4
parent5eaa8411ffeee7de8124d2ca83cbd6527b60c2fb
merge of 69f5e6634ad41e14c392c5aca06f4c4516ab4f21
     and e77aaa7cc80bddb255c4e859e17727dc070660df