merge of '42aeb6cf89b649d5a016a09ae349681bf15e9d83'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 4 May 2008 12:11:44 +0000 (12:11 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 4 May 2008 12:11:44 +0000 (12:11 +0000)
     and 'c9fa7fb8325f8de84b0694b28c1c0dc3e23e77c9'


Trivial merge