merge of '7370b7cb2be2fee991acda2f9f3376b3f7b46a68'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 13 Sep 2007 07:56:44 +0000 (07:56 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 13 Sep 2007 07:56:44 +0000 (07:56 +0000)
commit680843ec6547b952cd1af8686abb6a5f38349e3b
treee11b2f2031c0e713a22f8c419859c5fd65ff1140
parentefce805b53c162e3adaacbcb076a0bfb4212f98e
parente3247da7df8d550317c6fdbd9239ea49c8b51ff2
Merge ... '7370b7cb2be2fee991acda2f9f3376b3f7b46a68'
     and '8b47107ec4e62cba68868b4e79de81c71361255a'