merge of '0f42a8d653cc37dd474c367e444fab263968257a'
authorMichael Krelin <hacker@klever.net>
Sat, 16 Jun 2007 20:52:55 +0000 (20:52 +0000)
committerMichael Krelin <hacker@klever.net>
Sat, 16 Jun 2007 20:52:55 +0000 (20:52 +0000)
     and 'b6e86a37731576ee6fdcf7532f2acbe80763248d'


Trivial merge