merge of '5076ed26abde44cf0e9a27bb249bb0829b19ea16'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 8 Jul 2007 01:28:52 +0000 (01:28 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 8 Jul 2007 01:28:52 +0000 (01:28 +0000)
commit4bac3cbba68039a835ae747a45b1c76995da7552
tree67df03fae90a5a84ec6b1b2b969260c92f96239c
parent154af708451cce6148f55a8942c03d29d90c7fc7
parentce990bd80f75f0d33d15e9f21f516419f5675390
Merge ... '5076ed26abde44cf0e9a27bb249bb0829b19ea16'
     and '9a0ea0926b71ceec737d423255d8fce2074cc8b7'