merge of 3fed9104364d068f612d6a2a77c80f26f26f3544
authorRod Whitby <rod@whitby.id.au>
Fri, 14 Apr 2006 07:52:34 +0000 (07:52 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 14 Apr 2006 07:52:34 +0000 (07:52 +0000)
commit701bb78bdc0ce9a99f83be8691fc3a2e9cfffe1f
treeeca6c79abe873c4944a1158e78394f6e9d9fae96
parent15d9ea1913fe0043cf3d580f7fa2673db6df66aa
parent8976d52059d279621083343652ef2c23cae23da2
merge of 3fed9104364d068f612d6a2a77c80f26f26f3544
     and e0d458573e9c93b608fcceacd5ed347e607b4c2d