merge of '5a00df302fa5f0bd27e8591c24d944d935e7a4e9'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 19 Dec 2007 11:38:30 +0000 (11:38 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 19 Dec 2007 11:38:30 +0000 (11:38 +0000)
commitd7cdf8cc805a48bcb9f5dcf9de47ceaac4d35de3
tree4febbb4f1f546d043d65014ebcc8ba45ff95eaa6
parenta44b2bebc20265955dba5df4c37824671b4d540f
parent2fb453a9f4c045a6c74fccc81c1af8bf1e471ba7
Merge ... '5a00df302fa5f0bd27e8591c24d944d935e7a4e9'
     and 'a63f4a9ad21022afe5e9835d5f44018f136084e1'