merge of '964b970138436b573add519a1eae7ca7aec32517'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 17 Jan 2008 15:39:09 +0000 (15:39 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 17 Jan 2008 15:39:09 +0000 (15:39 +0000)
     and 'b8eab3d0461de7af79a745d6b20c8e008acb7af4'


Trivial merge