merge of 42fa354b672b23377813b6b278bf06236f7125ac
authorRod Whitby <rod@whitby.id.au>
Tue, 28 Mar 2006 20:44:34 +0000 (20:44 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 28 Mar 2006 20:44:34 +0000 (20:44 +0000)
commit8adb4fc8e5f9a1eb0cb174dd6a846a8ee7edd3fb
treeeb0f02ec58d29213c61c20e4d81f25442afaead8
parent45e6ba5a493ba86472bab1238049a055f8fd9d9f
parenta4f921a0bcfa7ec3ea032f94798a7cc7f9f00cf2
merge of 42fa354b672b23377813b6b278bf06236f7125ac
     and 7fb75dee044e15146c4486204f08a3d8b6f70c49