merge of '569e7d088bd81d3c7c545ac39e6e807ab3b47b36'
authorKhem Raj <raj.khem@gmail.com>
Thu, 21 Aug 2008 09:14:08 +0000 (09:14 +0000)
committerKhem Raj <raj.khem@gmail.com>
Thu, 21 Aug 2008 09:14:08 +0000 (09:14 +0000)
     and '805051d6b47931aa94c5c0cecd79401e04fd7b45'


Trivial merge