merge of '6880adb0bda3016728109ec284d7de4d080ab476'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 14 Sep 2008 22:45:50 +0000 (22:45 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 14 Sep 2008 22:45:50 +0000 (22:45 +0000)
     and '73269b9ebb04f990b133f5ca5bca0225c4da0470'


Trivial merge