Merge commit 'upstream/2.6.1p1'
authorBdale Garbee <bdale@gag.com>
Sat, 18 Apr 2009 18:05:40 +0000 (12:05 -0600)
committerBdale Garbee <bdale@gag.com>
Sat, 18 Apr 2009 18:05:40 +0000 (12:05 -0600)

Trivial merge