merge of '0a5045efa2609655b6717431c477b9d997fa9dd1'
authorRichard Purdie <rpurdie@rpsys.net>
Sun, 2 Sep 2007 17:00:38 +0000 (17:00 +0000)
committerRichard Purdie <rpurdie@rpsys.net>
Sun, 2 Sep 2007 17:00:38 +0000 (17:00 +0000)
commite5bfff86cf18937fdc72a58eb09b3c04d3219b10
tree70711bb0fb01cef9e56e25c73c6dc652860a9b6f
parent747a799995975abcad47e1548dc00387767253a3
parent49659842ea96fae2db1a049b6fab758c77f8b03b
Merge ... '0a5045efa2609655b6717431c477b9d997fa9dd1'
     and '8548c765d7840651dc3e1d81df59a848a8b61fb6'