merge of 883e320e9096e9d226b4afb571bc0438af7de629
authorJohn Bowler <jbowler@nslu2-linux.org>
Fri, 3 Feb 2006 18:59:05 +0000 (18:59 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 3 Feb 2006 18:59:05 +0000 (18:59 +0000)
     and a5d19c10f69d3e208c0ae13271dd3e70b219f1aa


Trivial merge