merge of '3157b6fd0bec0b66971ea7b32ac57dc1a5c92940'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 14 Oct 2007 14:38:23 +0000 (14:38 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 14 Oct 2007 14:38:23 +0000 (14:38 +0000)
     and 'd4ef8ebf38cc9ef7573a49017e35bd326024f285'


Trivial merge