merge of '355cafb7c6689b944b0668d7b743dff6ad6889ec'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 4 Feb 2007 22:20:51 +0000 (22:20 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 4 Feb 2007 22:20:51 +0000 (22:20 +0000)
     and '9c738861989606d0fa4e37315bc94abc74cd3078'


Trivial merge