merge of 2d6f8bd4b71a9ad4cd46736ff74dcf0bae763780
authorErik Hovland <erik@hovland.org>
Wed, 24 May 2006 18:56:25 +0000 (18:56 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 24 May 2006 18:56:25 +0000 (18:56 +0000)
     and 6d9a6d263913c8c725780872fe2f13329fcfb1b8


Trivial merge