merge of '65c91eebd05689a29a616ec89161e6f2fd9c175c'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 7 Dec 2007 18:43:34 +0000 (18:43 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 7 Dec 2007 18:43:34 +0000 (18:43 +0000)
commit223586bae2557eb9a3256a4354a364c5099385d9
treedf3dc2c59a86fb907c1223abbd8ebb9531e7b49a
parent5042d7cf071d441ae5b3a6a830b210865cd3ed43
parent8ce13db95ba691593fd17f17b2ceaed885bc3842
Merge ... '65c91eebd05689a29a616ec89161e6f2fd9c175c'
     and 'd15e00e8400bf7fe6620cae0a3299d08632f1ff3'