merge of '131aca0c8651e56bac39f5f02b88e33abc133b07'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 2 Apr 2007 07:48:05 +0000 (07:48 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 2 Apr 2007 07:48:05 +0000 (07:48 +0000)
commitd4258603cfbc50096cc09e88e7214820138781b2
tree908e5a526e580a9424645464e4c264cfb6a1804f
parentf6886c0f815a0cec5691308d14ccdb53abcdaee6
parent2f8dc919dea77f4b321f4f76a2c8059a6f94fba7
Merge ... '131aca0c8651e56bac39f5f02b88e33abc133b07'
     and 'f5edc19dd1057109ae156f97cd6387f3a74993fe'