merge of 2812814e008a70fdc0a1a8e0c011f96d8f67b57b
authorRod Whitby <rod@whitby.id.au>
Tue, 6 Dec 2005 09:16:14 +0000 (09:16 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 6 Dec 2005 09:16:14 +0000 (09:16 +0000)
     and 477a6d0aedc8faf8f5a2d9cc48fd1855759d7313


Trivial merge