merge of 7740b6ed65b5143742452d7e176244424dd90f02
authorRichard Purdie <rpurdie@rpsys.net>
Sat, 4 Feb 2006 16:21:52 +0000 (16:21 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 4 Feb 2006 16:21:52 +0000 (16:21 +0000)
commit38ad5b8d92ad0d03d92e44d63ac05b7ceeee1078
tree039b6f665ed1e19bfeb8c9e4809a2a4fded12ff9
parent4098aa1caf875ffa9a4eadf61d198fec29aa4a36
parent44e06d595adfa0ee032cd904e14fe69e71524456
merge of 7740b6ed65b5143742452d7e176244424dd90f02
     and 8b63d51862e914db45c25ecc48e39ba5d90699e8