merge of '154d82740f4a13ef53553ca5cd9af7689511b994'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 28 Jul 2008 21:34:49 +0000 (21:34 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 28 Jul 2008 21:34:49 +0000 (21:34 +0000)
     and 'd59dea16aa8c4ba3bb6565204bc02a02a9e906ff'


Trivial merge