merge of 4a7d921e80850f7a639e03de72acc36c6badae3a
authorRod Whitby <rod@whitby.id.au>
Wed, 20 Jul 2005 21:53:39 +0000 (21:53 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 20 Jul 2005 21:53:39 +0000 (21:53 +0000)
commitf15f94e2172ee62bbcef33c6e9fd4bfb03f492e4
tree8ac200d03a174ce62facbb02370a8bdc24d712dc
parent8aba67c458151eb8e611c7548029774be457a3cc
parent4eaa7b8d5d19da6cdd23f4d62992ac2a1a8d0e68
merge of 4a7d921e80850f7a639e03de72acc36c6badae3a
     and e29528cd2e6cd7c36e18b6318938ec5cbb2c01db