merge of '296ef22edf7d9a90ec4e4b1c1207b8d2c33940d9'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 10 Feb 2008 00:48:53 +0000 (00:48 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 10 Feb 2008 00:48:53 +0000 (00:48 +0000)
     and '8292332b90148c1fb91e9c775883dcf0639290c7'


Trivial merge