merge of 10fda4dfb0a2f5767e4a9d988a15ebb4f4cbf79c
authorRod Whitby <rod@whitby.id.au>
Fri, 14 Apr 2006 10:59:48 +0000 (10:59 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 14 Apr 2006 10:59:48 +0000 (10:59 +0000)
commit4e1d8353b3caf7603b725f697cbd375ba51f583a
tree20730cc9fe071bab560f7210ead6fb949a570de4
parentba4813236cfa8e229ddae4af68bb12b7ef9c9822
parent266a5116fd8b594fbd10ee97fb4b1ee5051f7b4c
merge of 10fda4dfb0a2f5767e4a9d988a15ebb4f4cbf79c
     and c49f43315981d8fb19ca487c3def795abc8299cf