merge of '696f3c5e555284edab7d8cdb02487889a270786b'
authorKhem Raj <raj.khem@gmail.com>
Sun, 3 Aug 2008 02:32:51 +0000 (02:32 +0000)
committerKhem Raj <raj.khem@gmail.com>
Sun, 3 Aug 2008 02:32:51 +0000 (02:32 +0000)
     and 'b701ffba40ab76cb5b74d4e7415eca78071755bb'


Trivial merge