merge of 60f3b0b53da7fd9ca4c8f4c025a26f9843c016f7
authorJohn Bowler <jbowler@nslu2-linux.org>
Sun, 5 Feb 2006 01:56:41 +0000 (01:56 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 5 Feb 2006 01:56:41 +0000 (01:56 +0000)
commitdbb098507e8c959424c32e299d8c91c0ae71332d
tree4ea7ed75be55308e5bd12ee8064406507a098ce1
parentdf2ca404d57c31ad1d5d05673a0830efb4b7038a
parent10bd7d788b2793de46dc96df9f2c87dc29340266
merge of 60f3b0b53da7fd9ca4c8f4c025a26f9843c016f7
     and 61a885ef092fb6f5203957b4bbecfd07dcd32f94