Merge remote-tracking branch 'origin/rettichschnidi' into unstable
authorAntonio Ospite <ospite@studenti.unina.it>
Wed, 21 Mar 2012 10:45:36 +0000 (11:45 +0100)
committerAntonio Ospite <ospite@studenti.unina.it>
Wed, 21 Mar 2012 10:45:36 +0000 (11:45 +0100)
commitf02525e0c94885e18a7cff407d87184db6b9c0ff
tree5ebc2bdbea30b67c4d3b3d61035a205dcef2184e
parentb19775ece86f40df15ffadcb358c8896bc847482
parentf4ddb64dbbc9703a77cfab149a13d0276f1a11e2
Merge remote-tracking branch 'origin/rettichschnidi' into unstable

Conflicts:
examples/am7xxx-play.c
examples/am7xxx-play.c