merge of 595aea330d5742253d5d1cca25ea86a0c2814685
authorJohn Bowler <jbowler@nslu2-linux.org>
Fri, 20 Jan 2006 19:33:24 +0000 (19:33 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 20 Jan 2006 19:33:24 +0000 (19:33 +0000)
commit364dd693a0d3ccea4a215ea38bfe20587a330c39
tree9c06e58a510bddc7c81e58b155b7be0cf82d7280
parent713ffb0ef8118b1fe233a209a95c740d2885b1e1
parent3833d213c0eb428b3664e27e4622fbecdcb3b76e
merge of 595aea330d5742253d5d1cca25ea86a0c2814685
     and 82bcdbbeb00c95318d566c7433ccdc8ac512737e