merge of '4fa4f87979de4219c88fba63ac6ae11b020aeced'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 15 Apr 2007 13:01:30 +0000 (13:01 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 15 Apr 2007 13:01:30 +0000 (13:01 +0000)
commitfcff371f805e713fee07d4882895a0ce3079fe45
treec9b4950ec4df25b7e7637178b33ecbd2f6d6b86c
parenta9a841c00016005d6f2ce70e438ffd98c0b18318
parent61b36b9dc7bfda4d1c4accf98d5f18e03d0be536
Merge ... '4fa4f87979de4219c88fba63ac6ae11b020aeced'
     and '9f6fbbb5245b3e296c86950b2208386df7b36ffc'