merge of '83d79b5cd4fd20054c665e25366f4ee45f3b681f'
authorRichard Purdie <rpurdie@rpsys.net>
Tue, 21 Nov 2006 10:47:09 +0000 (10:47 +0000)
committerRichard Purdie <rpurdie@rpsys.net>
Tue, 21 Nov 2006 10:47:09 +0000 (10:47 +0000)
commitd01cfe7cc36edc50e639f6b4964dd8064bc60817
tree6db15086d42e2a70a238d7ba5ded4624f0bdf98b
parent8292e638ccc07f088a4b88deb1daca1e33342f7a
parentb56ed4fb7777d38ba9e9db867f37fda6c6865b3b
Merge ... '83d79b5cd4fd20054c665e25366f4ee45f3b681f'
     and 'df3150bb10ef98bd118330fe8a496b4c29f4a861'