merge of '2a42d7d6448a3c4c1658313f80832acfc7533808'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 4 Sep 2008 12:03:08 +0000 (12:03 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 4 Sep 2008 12:03:08 +0000 (12:03 +0000)
commitd48c050212edcbe0faa9cf32511a232a90febac8
treef4ff1a1f94e3d0cbc24ff061469362a4b94921c0
parenta50b2687724177b23b1c85cd3b6bce0b23dd8488
parentc5ee828ecae451e30ca2fe78b1a4bd4fbb7d8076
Merge ... '2a42d7d6448a3c4c1658313f80832acfc7533808'
     and '7064c8198606896b1a1fbcdc87f350e61d1ce102'