merge of '4438796403c22448a9b59d2e3ef3a1862c3dbb5c'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 7 Oct 2007 19:41:33 +0000 (19:41 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 7 Oct 2007 19:41:33 +0000 (19:41 +0000)
     and '53810e0fab1828777809f84828547284fbd0d484'


Trivial merge