merge of 522ddd4c8860b47256c8a27f2b39d34c4e3b3d98
authorRichard Purdie <rpurdie@rpsys.net>
Sun, 19 Mar 2006 17:21:52 +0000 (17:21 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 19 Mar 2006 17:21:52 +0000 (17:21 +0000)
     and b8b3a6adaac0e7f64525ebfc53d429e599c9ea65


Trivial merge