merge of '49118a4c6035353c0f8cf1aa30297dd36e43241f'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 21 Jul 2008 22:17:38 +0000 (22:17 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 21 Jul 2008 22:17:38 +0000 (22:17 +0000)
     and '88a5ee5dca39386c6bd95c87a62d1b9c74cd7b32'


Trivial merge