merge of 'a73ff29a7779a9a8a8b4220a0bab38e53c25c6a9'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 24 May 2007 14:22:05 +0000 (14:22 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 24 May 2007 14:22:05 +0000 (14:22 +0000)
     and 'f497aad6e34e5d5cadbd7393758db14fdd9b005d'


Trivial merge