Merge branch 'master' into next
authorAndre Noll <maan@systemlinux.org>
Thu, 5 Nov 2009 23:28:05 +0000 (00:28 +0100)
committerAndre Noll <maan@systemlinux.org>
Thu, 5 Nov 2009 23:28:05 +0000 (00:28 +0100)
commitf24f82d9a9134562abc331558b9e21feff91b93b
treeeeff64ce59657ba5aba48ba9f979af1d67173f76
parent29adb40f69ca452a719e8519a8fa9452b3143e1d
parentd1f203ea37e3b3ca0ac6db268331961caa47d705
Merge branch 'master' into next