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)
commit18e012cd023b2ef139806a58bf67110b9c4f1abb
treebe532222aff3ead62c03c4cde2cb78e43227541c
parentb111dc249f43a28f22c12cf646d9b68c34adfa39
parent6e217552944efc56513ff6bb1cc6d3218a84ca14
merge of 37095a40659e7e7112038308d6b630bd7a258bd5
     and e588b97112ee40d0ed224469b12043a82ffb1366