merge of 'ad35118024f3b76889242bd536bd859675845efd'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 21 Mar 2008 15:48:29 +0000 (15:48 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 21 Mar 2008 15:48:29 +0000 (15:48 +0000)
commitd4b4ea8a4cafb8a41843e62c618b5e9ca652c37d
treef321da860b044ac53d5fc942e923f19535c48312
parentd1e1b0fa8a08cb717206a3a2fbc0fa0b2f4f68fd
parent9c6043280dda581f25c502be1c776babf4ec51f3
Merge ... 'ad35118024f3b76889242bd536bd859675845efd'
     and 'f1f02c875914c0bfe542289381d12559c4843ff7'