merge of '1334e5973904d3ffb6bf8fc09ee4ee1f196f89d7'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 10 Mar 2007 14:26:03 +0000 (14:26 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 10 Mar 2007 14:26:03 +0000 (14:26 +0000)
commitba1212299e2a4b2b99c1d058660273eb92327490
tree8e7565e5518727f54c42bef89eadee972058deba
parent54da6877f11a0c74b4e4a55ff0bade5cf3a7c5d8
parent5dfbb450f05b0ea1788466c0929ab2344c605b18
Merge ... '1334e5973904d3ffb6bf8fc09ee4ee1f196f89d7'
     and '23ad96f5be867b4f297808985a4d7ac90b8f15ea'