merge of '18c78b60a5927032930ff3a527704644b4381596'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 5 Dec 2007 18:04:34 +0000 (18:04 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 5 Dec 2007 18:04:34 +0000 (18:04 +0000)
     and '8d6f2bff537009418cf71f5bace2396761aeebe3'


Trivial merge