merge of 931370684daa1b1fc8aac0ef4e41d0ba46bb6517
authorJoseph Cole <jnc@unknown.openembedded.org>
Sun, 26 Feb 2006 04:17:48 +0000 (04:17 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 26 Feb 2006 04:17:48 +0000 (04:17 +0000)
     and b0535ae5d884f64c3f25212755c0dbbd607a4984


Trivial merge