merge of '14cc680dbaa6317eec602330d2fe0ac7dea3be7a'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 12 Sep 2006 09:25:38 +0000 (09:25 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 12 Sep 2006 09:25:38 +0000 (09:25 +0000)
commit30136a8e89b86b9e3d0fa4b07fafdf484ff8d4f2
treefda5c2385c803bfdf3e338b3368c7d14622e41c4
parent431b0378e7c2a282c4dc5ba2bf641d644facc4dd
parent1849c7146319438853e3b6c932003bde1a14b32f
Merge ... '14cc680dbaa6317eec602330d2fe0ac7dea3be7a'
     and '350557edbea2aa55107ce4c0e4dffc849b7e2307'