merge of '9697772e74e1128fc7696d65c26aec0bb8220e75'
authorKhem Raj <raj.khem@gmail.com>
Thu, 21 Aug 2008 16:12:05 +0000 (16:12 +0000)
committerKhem Raj <raj.khem@gmail.com>
Thu, 21 Aug 2008 16:12:05 +0000 (16:12 +0000)
     and 'b0c9a74424acfce135b17d6a7401f03f59e733aa'


Trivial merge