merge of '1d03ea3d490cbb5935a7a927a9bfd95a70c8599f'
authorKhem Raj <raj.khem@gmail.com>
Sat, 20 Sep 2008 00:07:00 +0000 (00:07 +0000)
committerKhem Raj <raj.khem@gmail.com>
Sat, 20 Sep 2008 00:07:00 +0000 (00:07 +0000)
     and '2551aa2928c2ff58083738f1e4e839273afde6d4'


Trivial merge