merge of '0af36442f2b5ad5f505d802f19a109562afaee66'
authorKhem Raj <raj.khem@gmail.com>
Sat, 2 Aug 2008 19:21:00 +0000 (19:21 +0000)
committerKhem Raj <raj.khem@gmail.com>
Sat, 2 Aug 2008 19:21:00 +0000 (19:21 +0000)
     and 'ef96b95bd9637cbe10bcca0129b560159fdedafb'


Trivial merge