merge of '518cab8ae2535562912ff7f5fdba8458448a0e18'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 18 May 2008 20:08:50 +0000 (20:08 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 18 May 2008 20:08:50 +0000 (20:08 +0000)
     and 'c0506e8e648ca1fe78fd69e6ce1b63a3bd38d877'


Trivial merge