merge of a9390448d82c08088c9697046e14075f0c439840
authorRod Whitby <rod@whitby.id.au>
Tue, 11 Apr 2006 06:34:00 +0000 (06:34 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 11 Apr 2006 06:34:00 +0000 (06:34 +0000)
commit4841b201810b9b6dff9ecbafdfd766a925a6c1eb
tree84dd599b1cdfb6bb57197550f2afaa8d60371a85
parent4cbd322d0f3861f9186f104d126844c5442f9a25
parent0c9a8e4fd40c857390d4b729aa1449d3308c32d9
merge of a9390448d82c08088c9697046e14075f0c439840
     and d93900aa884b52d778b478749eeafadb6bef3a21