merge of '7d07d609f8af621d346ce23b17396f9c6c2c9c72'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 1 Apr 2007 14:35:21 +0000 (14:35 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 1 Apr 2007 14:35:21 +0000 (14:35 +0000)
     and 'c753fde1cef923f9f49b724093483f377f7b72d0'


Trivial merge