merge of 678605ef4af7fd23d048b55eb08df1ce8f4d3075
authorPhilipp Zabel <philipp.zabel@gmail.com>
Sun, 28 Aug 2005 15:38:22 +0000 (15:38 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 28 Aug 2005 15:38:22 +0000 (15:38 +0000)
commitb59d9fe16be921107063d72a62a8111a9ecf7a58
tree82c901b9de35cab705d38de6eb3a0d2562133179
parentaf6454bb20d49aef0a8e6f055c27067f6ae180d6
parent1207e1c0ea604485bc87179df350b697bac56b59
merge of 678605ef4af7fd23d048b55eb08df1ce8f4d3075
     and c261104f5142fb845f7ca1428c63d50c9c16dc92