merge of '2375d2fb670fe2ce998bde5533f4ef0498268ca5'
authorRichard Purdie <rpurdie@rpsys.net>
Fri, 28 Dec 2007 17:51:14 +0000 (17:51 +0000)
committerRichard Purdie <rpurdie@rpsys.net>
Fri, 28 Dec 2007 17:51:14 +0000 (17:51 +0000)
commit76babfb9287899328224b3a9241463302edcdc95
tree114f7400275d619bcec90556ddd4edd4b6c0b799
parentfb694ae0d0781bb1e40766c01b58160b77e52791
parentf5d0a34ae41c547b12c871be65995c2cbfc488f5
Merge ... '2375d2fb670fe2ce998bde5533f4ef0498268ca5'
     and 'dabc3297e759e315e1277ff276c735684af8e55d'