merge of 73a458a7f5d306cf25469186c7ca277895c5e2b2
authorRod Whitby <rod@whitby.id.au>
Tue, 25 Apr 2006 20:34:35 +0000 (20:34 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 25 Apr 2006 20:34:35 +0000 (20:34 +0000)
commit5cb8c8eb102bd6a3194ff5eb0cc00a855cd98573
tree729fe341ac637032bea9c062b0e8527781840827
parent82362cd17cc3cf1b6be49f397dd0530f44b076bb
parent5cd19f04519ac49e6bc3ebf9ac1d63a2c1f333da
merge of 73a458a7f5d306cf25469186c7ca277895c5e2b2
     and b45333304fdefa7fde471e8d3b251f8557ffb146