merge of 37095a40659e7e7112038308d6b630bd7a258bd5
authorJohn Bowler <jbowler@nslu2-linux.org>
Mon, 16 Jan 2006 19:42:59 +0000 (19:42 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 16 Jan 2006 19:42:59 +0000 (19:42 +0000)
     and e588b97112ee40d0ed224469b12043a82ffb1366


Trivial merge