merge of 29134267458b518b87fa720d106c0188db1b6131
authorPhilipp Zabel <philipp.zabel@gmail.com>
Thu, 1 Sep 2005 17:46:39 +0000 (17:46 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 1 Sep 2005 17:46:39 +0000 (17:46 +0000)
commita06baa77957b94afd763e2f2881e03baf9b7cfcc
treeb5fb7bf86309ac9ad7e58de49749fef643062cef
parentea899cfb752cf00b2f194d64c76fdfdecfb1f6c9
parent32e17c17bfda2f7a289b4d4d9058bec7903e4a19
merge of 29134267458b518b87fa720d106c0188db1b6131
     and 296ac2a5b3ca43f1af1caec04d2643a3970aecef