merge of 45de09dab54a555a9dcd180a4903909773cf34d2
authorJohn Bowler <jbowler@nslu2-linux.org>
Mon, 30 Jan 2006 00:21:37 +0000 (00:21 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 30 Jan 2006 00:21:37 +0000 (00:21 +0000)
     and e4d8da41e5409080382f7a87c16b20bcc29516e3


Trivial merge