merge of '441bcea0ba57eb2b93c3337a770e15a243b489e8'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 30 Mar 2007 10:51:51 +0000 (10:51 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 30 Mar 2007 10:51:51 +0000 (10:51 +0000)
commitc25379344f27dee615eb6e9ff7c9100ca4292dbb
tree57af92a55194b94f2c290c0181ee380b63da32d4
parentf8031d469e07891f26db9f31c09e0fe9e4eaa8d1
parente034d2dc97af3615a02b7c4bf5f24ef7b36a0325
Merge ... '441bcea0ba57eb2b93c3337a770e15a243b489e8'
     and '8c2e3e8095dc7b333dc78aab31ac1f04f447485f'