merge of 4daf34d7b97dde040c825249e39abc6af0abf493
authorRod Whitby <rod@whitby.id.au>
Fri, 13 Jan 2006 20:25:25 +0000 (20:25 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 13 Jan 2006 20:25:25 +0000 (20:25 +0000)
     and 7f6d02bad0d27e0bd6a0d6e493318b5275142389


Trivial merge