merge of 46a3490245fc8234a2a3cf3dea9bf7c79bb7c851
authorRod Whitby <rod@whitby.id.au>
Wed, 7 Dec 2005 22:01:24 +0000 (22:01 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 7 Dec 2005 22:01:24 +0000 (22:01 +0000)
commitb3d83dff4831a0b515357d6c91cd3246f66845bd
tree5edd014b61a5396eb5415c59bc804e6675ce9b9a
parent01ffc7cea28ec192abb272396caa917f474e5d86
parentad4966cf68d182ce2930707f6afff3f0b0b7c4c1
merge of 46a3490245fc8234a2a3cf3dea9bf7c79bb7c851
     and 8183e5d9f7ede3a50afeceb17ef486ccbc630bec