merge of 4dfda95c476d921e6eef34e4f4f52f0bc1131fbc
authorRichard Purdie <rpurdie@rpsys.net>
Tue, 14 Feb 2006 09:03:32 +0000 (09:03 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 14 Feb 2006 09:03:32 +0000 (09:03 +0000)
     and c32c48613e0dc4ce1e969ae67a809fb9b9953787


Trivial merge