merge of '0b31bda390691b7d9e15f77a2ea3e3705bbf2f12'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 13 Apr 2007 07:11:09 +0000 (07:11 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 13 Apr 2007 07:11:09 +0000 (07:11 +0000)
commitc4198c0a4330347a88583da3dd7cc0c1e7b9a0d0
tree2ecfe3a5cc3bf4860ba926926ae49f7955e2a765
parent4db3cf0ae1688007779db00019287084f6b063b6
parent43232a233516b72942e47ee650221c64c331f13e
Merge ... '0b31bda390691b7d9e15f77a2ea3e3705bbf2f12'
     and '5bcded2dc238545b2379f23a18eda0fc75732a6b'