Merge remote-tracking branch 'origin/simple-quiet' into multiarch
authorKeith Packard <keithp@keithp.com>
Fri, 7 Oct 2011 14:41:56 +0000 (08:41 -0600)
committerKeith Packard <keithp@keithp.com>
Fri, 7 Oct 2011 14:41:56 +0000 (08:41 -0600)
commit128bbfa150f88c09f7adde2434b7bf0b5a9ed556
treeea1a1f66e0f2be53decf1ca31baa77a8710ec73e
parentf6f54d70b768dca1715ddddea64a4df00d82b09e
parent246864b0597ddd397aba39be1fe39df0df189433
Merge remote-tracking branch 'origin/simple-quiet' into multiarch

Conflicts:
configure.ac

fix version number
configure.ac
src/cc1111/ao_ignite.c
src/core/ao_telemetry.c