merge of '81bbe6194f50dea1d1a9838b702680d8b353e689'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 22 Jan 2007 09:37:39 +0000 (09:37 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 22 Jan 2007 09:37:39 +0000 (09:37 +0000)
commitce8e801d9b95f70dbffff6e8d7de4df67478ff29
treea39d344e60a677e208e37d27660077aad538a656
parent2b5598807571ca28c8c81a415ea14748fff94fc2
parent0e17043b9f0c264dc77531c3c635c4e2e3d6a819
Merge ... '81bbe6194f50dea1d1a9838b702680d8b353e689'
     and '86d064241f76c59a2663d25f57ee15ef950bee4b'