merge of 87274db5332eba6f472a3332129b88b8282ccda2
authorJohn Bowler <jbowler@nslu2-linux.org>
Mon, 6 Feb 2006 18:36:28 +0000 (18:36 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 6 Feb 2006 18:36:28 +0000 (18:36 +0000)
     and 3b6a0bff32c9c79ebeb059cd1559d7731542af03


Trivial merge