Merge 'trunk' into 'BUILDARGS'
Yuval Kogman [Thu, 26 Jun 2008 15:50:25 +0000 (15:50 +0000)]
r83447@syeeda (orig r4769):  nothingmuch | 2008-06-26 18:47:52 +0400
changelog


Trivial merge