merge of '09bb66d3fb1db889848916179b819a78e4efde02'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 24 Apr 2007 11:42:20 +0000 (11:42 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 24 Apr 2007 11:42:20 +0000 (11:42 +0000)
commit66b51f3fbd8726ba8300034ca284d600d5bd7ffe
treec8d0c1b4b0c04ad5b6f125e4a7e83b39dafa8cec
parent25ee40cfa54979048d76dc5f753f177d6295b5ef
parent7a50d90da7604a6bbc27b69a21d7e4aaffea01aa
Merge ... '09bb66d3fb1db889848916179b819a78e4efde02'
     and '67a5fc719e8eed7c1ae79482dc4aac1049cd7140'