Merge branch 'master' of git://repo.or.cz/nslu2-linux/master
authorRod Whitby <rod@whitby.id.au>
Thu, 12 Feb 2009 05:09:37 +0000 (12 05:09 +0000)
committerRod Whitby <rod@whitby.id.au>
Thu, 12 Feb 2009 05:09:37 +0000 (12 05:09 +0000)

Trivial merge