merge of 47dce11edfa131d098408e653487b0f793394e95
authorKoen Kooi <koen@openembedded.org>
Sun, 8 Jan 2006 00:35:22 +0000 (00:35 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 8 Jan 2006 00:35:22 +0000 (00:35 +0000)
commitaa659825f852872c0c91724212607fb9c519cb30
tree7d4eda8d916842a750e0c77e89e9e7f918a4b265
parent7091dd78f0cc114fe3e748276363f09c2dfe820f
parent7ac9d52d1b2fb6008774f1267f707c7c6a7c4b06
merge of 47dce11edfa131d098408e653487b0f793394e95
     and 61486dc9a1b23e7088c746a1a9d6c6199cc8f5a5