merge of '46ca801f1efcaa636eaa43837f3587c7c90a93ec'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 15 May 2008 09:10:40 +0000 (09:10 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 15 May 2008 09:10:40 +0000 (09:10 +0000)
commit1bad870be75c7b27966971e237f62b4db660ca02
tree03e69caab4bebcac6c80a015b9f06c1827d16fb6
parentf44125b60d426fb5778b5a145e526e2714516646
parent2a011801cb8ede0c4fea10c86c978c4ccbaad5ce
Merge ... '46ca801f1efcaa636eaa43837f3587c7c90a93ec'
     and 'c4f0fa8168863feb54d1292280f576d79b26222f'