merge of '2f056216a3cb2fc336cb26d0b043d22913f23616'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 7 Dec 2007 19:03:15 +0000 (19:03 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 7 Dec 2007 19:03:15 +0000 (19:03 +0000)
commit7db4186a9fd14bb2db57e14b44bf2035f59f2790
tree0edc450594870821002f2cc72c606064da31be62
parent223586bae2557eb9a3256a4354a364c5099385d9
parent8fe1bccee764bc0c5c8aec78e9aeb5cbf994a84b
Merge ... '2f056216a3cb2fc336cb26d0b043d22913f23616'
     and '9fc11ccdee4cd06908074985765cc44cf143e5ae'