merge of '44e174b3ce2f7bdec89689f8329e4fe03a345f08'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 10 Dec 2007 12:57:29 +0000 (12:57 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 10 Dec 2007 12:57:29 +0000 (12:57 +0000)
commit4d0d14578377c6295735684f24e5d4e1327b2e31
treecb38d51e2c0fbfe5118fdf8432b9d7c99c91109e
parent99a36320bc16474c11c6073732d3877fbb02f504
parent3b4dfb30fa104fbf83fffb80fc50df4cce814c0b
Merge ... '44e174b3ce2f7bdec89689f8329e4fe03a345f08'
     and 'b075adcf4c74f28e1d73ec39796adb35c127dcce'