merge of 4244fcc1342db41f3c990bf797b685be65d4edaa
authorRod Whitby <rod@whitby.id.au>
Tue, 9 Aug 2005 18:00:24 +0000 (18:00 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 9 Aug 2005 18:00:24 +0000 (18:00 +0000)
     and a76f350b51bedef01b414ca428726bc656900e86


Trivial merge