merge of 190ba6d987a58bb9185b18f91b075113f31cbae0
authorJohn Bowler <jbowler@nslu2-linux.org>
Mon, 16 Jan 2006 01:38:20 +0000 (01:38 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 16 Jan 2006 01:38:20 +0000 (01:38 +0000)
     and e28d190b53d034845e4ae2fce2648104676a571b


Trivial merge