merge of '70aa18fe06d3e3a4ad005666e02d3c53f91a5fa1'
authorKhem Raj <raj.khem@gmail.com>
Wed, 8 Aug 2007 17:55:14 +0000 (17:55 +0000)
committerKhem Raj <raj.khem@gmail.com>
Wed, 8 Aug 2007 17:55:14 +0000 (17:55 +0000)
     and '9337a5ff3440772705d464c123d99b9bcbe72cd0'


Trivial merge