merge of 'd1405d37b57316e56826c15ad9770b0ae3e31f7d'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 25 Nov 2007 20:33:19 +0000 (20:33 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 25 Nov 2007 20:33:19 +0000 (20:33 +0000)
     and 'd5059e99123ac26efa72358d1cdbbb2776399a25'


Trivial merge