Merge branch 'master' into experimental
authorSebastian Pipping <sebastian@pipping.org>
Thu, 20 Jan 2011 14:39:31 +0000 (15:39 +0100)
committerSebastian Pipping <sebastian@pipping.org>
Thu, 20 Jan 2011 14:39:31 +0000 (15:39 +0100)
commit901be4dec29197200fa7d6892a4542e1c45f3d1e
tree1319117b8527ab27795d4d51ce9dfdbc037a0aff
parent886262e44e10830277c987089e1c85b065a2e4a2
parent64c32a94bd538c08b1e741f543cc8fcd9b0391ed
Merge branch 'master' into experimental

Conflicts:
ChangeLog
ChangeLog
gen_configkernel.sh