merge of 6e871c66a3a79d4cb65e5784eace4cb7896df590
authorPhilipp Zabel <philipp.zabel@gmail.com>
Wed, 1 Mar 2006 18:28:10 +0000 (18:28 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 1 Mar 2006 18:28:10 +0000 (18:28 +0000)
commit288d131871a9b7e7857bfdb8556fd1a41f5259e8
treec0eba71cd1ce8cce2e9bf9d08bba84068e5a86d9
parent2fb5f01e23b04e171d4dea6e5d1af5640386efac
parentca83ab4389e988210ab0691dfd4dc29f54e6dfb6
merge of 6e871c66a3a79d4cb65e5784eace4cb7896df590
     and f16c11d524e85958fbc2b3ec749e166ed4669741