Merge git://git.infradead.org/~dwmw2/cafe-2.6

This commit is contained in:
David Woodhouse 2006-11-28 22:43:10 +00:00
commit 1aaaeabf36
4 changed files with 2162 additions and 1 deletions