merge of '37503acf69411b447655a4711ed7b553120c14df'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 13 Jan 2008 17:33:28 +0000 (17:33 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 13 Jan 2008 17:33:28 +0000 (17:33 +0000)
     and '99d10c4327664b741cfed74f3f99ac3f6d9e5b7b'


Trivial merge