merge of 1133a2f6d7624f04cdda9771f28e1502680e7213
authorRod Whitby <rod@whitby.id.au>
Mon, 6 Feb 2006 00:46:35 +0000 (00:46 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 6 Feb 2006 00:46:35 +0000 (00:46 +0000)
commit9b188ea2600bce6ed35559b21677bd8b7223f5a8
tree40e9328ce853279c0eae8ecc851d514ef01c26d1
parent76107d774ec7a96b7788d2f2b98b5621a04cfe71
parent1be31761f3449cd4f92508fd2c2c41968039c918
merge of 1133a2f6d7624f04cdda9771f28e1502680e7213
     and 59438d13db19ded8e22646fb8cddf849804f3a90