merge of '8cfccf7d76cedeebb5fc468a8aa4943a21baf0bc'
authorRichard Purdie <rpurdie@rpsys.net>
Fri, 29 Feb 2008 16:13:36 +0000 (16:13 +0000)
committerRichard Purdie <rpurdie@rpsys.net>
Fri, 29 Feb 2008 16:13:36 +0000 (16:13 +0000)
commite88ffd7608ec1015eba1a92d293cf11d7d9092cf
tree28ca62500b06481a639bed91512c5bb59567e1e4
parent339144112d488d42d84fe5e1d91ba20bde769f76
parent841137578b67664560a7cfb14443cac1c2031420
Merge ... '8cfccf7d76cedeebb5fc468a8aa4943a21baf0bc'
     and 'cc62ac9db8f51dbeefed076296fcde38fb94e71b'