merge of 9163a4b2aa3f51ec4fd9c17fbf7e8cacf1c0f767
authorJamie Lenehan <lenehan@twibble.org>
Sun, 28 May 2006 02:38:36 +0000 (02:38 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 28 May 2006 02:38:36 +0000 (02:38 +0000)
     and b4098f1c54899bc7168ca2c5d533fd2676462e9c


Trivial merge