merge of '07a342693675fe2b1daacf0eb62302579d9fade3'
authorRichard Purdie <rpurdie@rpsys.net>
Fri, 16 May 2008 10:13:43 +0000 (10:13 +0000)
committerRichard Purdie <rpurdie@rpsys.net>
Fri, 16 May 2008 10:13:43 +0000 (10:13 +0000)
commit0d183d43d530b466d6fb877f2b393f6c3a2b3f66
tree45a6c0a481d4da8f92e09e40301905ca4b817604
parentb4d06a158611035ed30b6fc8221e3320e0400556
parent149338360fffc90d6d06ee0036a000881a231428
Merge ... '07a342693675fe2b1daacf0eb62302579d9fade3'
     and 'ea87a62ffb26f02649d7a8b5be07fcb5b84ba802'