Merge 'cookbook_fixes' into 'trunk'
Peter Rabbitson [Thu, 3 Sep 2009 18:42:45 +0000 (18:42 +0000)]

Trivial merge