merge of 3ef88e1af076f327d80f58bf19c627bb32b6b865
authorRod Whitby <rod@whitby.id.au>
Fri, 13 Jan 2006 23:30:25 +0000 (23:30 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 13 Jan 2006 23:30:25 +0000 (23:30 +0000)
     and 919c016d00fbf315110a2c0151d233033ef926d4


Trivial merge