merge of '723287caa1b0cd2e362ab6dd69f9e8db2eaca821'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 31 Jan 2008 13:18:45 +0000 (13:18 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 31 Jan 2008 13:18:45 +0000 (13:18 +0000)
commit77c0e0678373170e7dcc54910b4b2e731c084db3
treefc9f5a0950e9012a3c49df35aeb174ce581d25f5
parent7ac5c78cc557fb33f6fb5626a756b3f4f4b57ece
parentd567423ad0029843daa5004cdd91304cacdb4491
Merge ... '723287caa1b0cd2e362ab6dd69f9e8db2eaca821'
     and 'c07273f2dc49a66c31c6d5d925b7e24647366621'