merge of '35442223e2d33755090d92a33d52bde6f6e207a1'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 13 Mar 2008 15:18:09 +0000 (15:18 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 13 Mar 2008 15:18:09 +0000 (15:18 +0000)
commit672fe5a52653790783da41d4809ba763d0e49e27
tree50cf0b33ec8641e63e230afb395960066a1cc508
parentdfecbe7c7536f2de8cedc17d54caa360758d0d56
parentd17e5672c1ad07193835e47188e8819f7b9ad63d
Merge ... '35442223e2d33755090d92a33d52bde6f6e207a1'
     and '7050fca057f88bff7fa417c61f8dd6b9596a36ad'