merge of 48e22a27d72e0291a7522958cfc2305284cb8d98
authorRichard Purdie <rpurdie@rpsys.net>
Sun, 30 Apr 2006 13:03:25 +0000 (13:03 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 30 Apr 2006 13:03:25 +0000 (13:03 +0000)
commitc15557bd9f35bc698b01ea8029c62594b42d57f3
treee6b63835d3836d1998ab548d7451d38e1821ac3c
parent0dbd9b178c473a9cb7a661c3eacf9875c9cf91d4
parenta0f36157c7da268d0e779866e80d3c7278e0d29e
merge of 48e22a27d72e0291a7522958cfc2305284cb8d98
     and 6b52726b2e4761c9b7b4858f6bdbc723e606359a