merge of 15a80a372d1017d221f1e725cae0070d170078cb
authorRod Whitby <rod@whitby.id.au>
Fri, 14 Apr 2006 21:17:19 +0000 (21:17 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 14 Apr 2006 21:17:19 +0000 (21:17 +0000)
commitaf72986b4e3099aef8678286fb5e498d542a6b13
tree4e0f078c95badf5a2c32365829574dc4caf9acd3
parent2e9ec3d5cdfbd7223cab5fe15277a17139775aca
parentc17a4ae511d8ce8d77de3ab3d8dc58cc27dcdeae
merge of 15a80a372d1017d221f1e725cae0070d170078cb
     and dbf92f630b3fa1d33d2075e276de7d428f1b8aaa