merge of 46db27fa739a4e4dbc48014380db5c6d2cbde37f
authorJohn Bowler <jbowler@nslu2-linux.org>
Sun, 5 Feb 2006 22:23:12 +0000 (22:23 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 5 Feb 2006 22:23:12 +0000 (22:23 +0000)
     and eedeac9741d0ad1da70a5545c21f0803a63bf9f0


Trivial merge