merge of 7f8e96e82814721e7ae8b59c9afa5c0a9084d7d7
authorJohn Bowler <jbowler@nslu2-linux.org>
Tue, 15 Nov 2005 19:08:31 +0000 (19:08 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 15 Nov 2005 19:08:31 +0000 (19:08 +0000)
commit4a43831db39a507216f33ddb46617bfe5d4f0d3e
tree5861b356b1717b7b247e13856c6f454a61322c16
parentef17342f3996aeb72e9d7b7c095a85c16a030330
parent921364525a0ae781b2528a7e922e8b2c7d119e75
merge of 7f8e96e82814721e7ae8b59c9afa5c0a9084d7d7
     and e22e7c7ff9ab06d30951d9048b867b089b9185ea