merge of '30d4ffe61f8be818a3284fcd72f5e65697855083'
authorRichard Purdie <rpurdie@rpsys.net>
Sun, 29 Jul 2007 21:02:17 +0000 (21:02 +0000)
committerRichard Purdie <rpurdie@rpsys.net>
Sun, 29 Jul 2007 21:02:17 +0000 (21:02 +0000)
commit6e06e5879e2cfb4d66001f0df10d22a1120e617a
tree28b6adf76418665a8cd7fc0cea5cb601ecd32c9e
parent5ac7cc0c932273ceb519bb4b5a601861c6f23537
parent927100f553960d7b87f51f70ae159017fde6010f
Merge ... '30d4ffe61f8be818a3284fcd72f5e65697855083'
     and '871de5bd63d5f7181059bcc581e6f21a7d547242'