Merge branch 'master' into next
authorAndre Noll <maan@systemlinux.org>
Wed, 18 Nov 2009 18:28:28 +0000 (19:28 +0100)
committerAndre Noll <maan@systemlinux.org>
Wed, 18 Nov 2009 18:28:28 +0000 (19:28 +0100)
commit0e5cf478af1c9d0507085a73785f0988e81c791f
tree2c65f621aec75f45e9b1c919e4875e1539b75232
parent6d9694ba196bdfa0398a379e0f1b4deeef2bb4c5
parent802348691238fbca1b50f19a9331806a0786b097
Merge branch 'master' into next