merge of 'bb62cdee9cf4ddc24862a7f51bb4b176bc249b7a'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 18 Mar 2008 18:27:33 +0000 (18:27 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 18 Mar 2008 18:27:33 +0000 (18:27 +0000)
     and 'cc931d5c43ef85abee7c221aabb801302e9c1ee8'


Trivial merge