merge of '2eadd91fadb429f90d6d5b0714a7265811f206b6'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 18 Jan 2008 01:09:50 +0000 (01:09 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 18 Jan 2008 01:09:50 +0000 (01:09 +0000)
commit58948b0f9e5b8694748e1f1f1019290eb56c102f
tree75c8b200d64ae0dea06d87b293c539fc6712717c
parentc2906680781aaebafa1a72afa8be1d941bea847a
parent3df159cb1cf41ba1885d423937b5a8ca9f90c1fd
Merge ... '2eadd91fadb429f90d6d5b0714a7265811f206b6'
     and 'a17466e62ff1000054de2b883169fb332ceb8d66'