Merge branch 'master' into next
authorAndre Noll <maan@systemlinux.org>
Thu, 5 Nov 2009 21:49:33 +0000 (22:49 +0100)
committerAndre Noll <maan@systemlinux.org>
Thu, 5 Nov 2009 21:49:33 +0000 (22:49 +0100)
commit29adb40f69ca452a719e8519a8fa9452b3143e1d
tree678f63ab5b169c44ccf81a2997d79dd56c9a47e5
parent141dc61fdf8720b6e0126b10c18d429d9d4944db
parenta4eb244ecdf9aaa0f167b3c91d3e276bde99d681
Merge branch 'master' into next