merge of '7b32aa8708eff49950269f0ff77537df8a712616'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 7 Sep 2008 16:14:10 +0000 (16:14 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 7 Sep 2008 16:14:10 +0000 (16:14 +0000)
     and 'a43636037bc9323fe6ee34266933582908d035e2'


Trivial merge