merge of 20102c595555b6f10738ef4a8f639e4f90345415
authorRod Whitby <rod@whitby.id.au>
Sat, 9 Jul 2005 13:34:15 +0000 (13:34 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 9 Jul 2005 13:34:15 +0000 (13:34 +0000)
commitcb3a0cd64987084fa719eebca83b38c879ecd224
treef029dccbad8bb07f09a2b37a063a9c355c653db5
parent41e77f2c7cd9d275311ff5f7d54aff3d50d8830b
parentf16b7c8f5bfe23e1341158bbb14f74235c36a45c
merge of 20102c595555b6f10738ef4a8f639e4f90345415
     and 841f6095e2634754c040515b151d9b5e84e3dcb8