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)
commit60d19c2a86d4535f10a33a35cedd9c381fb6f592
treedcb14971f7e68556d186cd2ce6c31fdc1c91ff5c
parent2d363fc768136bd0d6cdeb07aedb1d6715bdfab9
parentd754a329cb5d4711db7a8cd5ac4e32b4d11016c3
Merge ... '6880adb0bda3016728109ec284d7de4d080ab476'
     and '73269b9ebb04f990b133f5ca5bca0225c4da0470'