tree 3251d6bea051ad11397e6128ae584c1a4b85a5e6
parent ad6a9984eec72f3a609a8685281740f5e5f466aa
parent bef9c558841604116704e10b3d9ff3dbf4939423
author  <jgarzik@pretzel.yyz.us> 1117088236 -0400
committer Jeff Garzik <jgarzik@pobox.com> 1117088236 -0400

Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git branch HEAD