merge of 006ff5c889f07b22718fa73951084ab94aba16aa
authorJamie Lenehan <lenehan@twibble.org>
Fri, 23 Jun 2006 01:06:26 +0000 (01:06 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 23 Jun 2006 01:06:26 +0000 (01:06 +0000)
     and 1526da957aace3f1e2502307c4d8877090168c67


Trivial merge