merge of 'a33b3d19ac330b59af9dbbb80b1410d4579bba26'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 14 Feb 2008 14:46:23 +0000 (14:46 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 14 Feb 2008 14:46:23 +0000 (14:46 +0000)
     and 'cf95baceadabcd81db8870bc4477337b22deeacd'


Trivial merge