Merge branch 'master' into micropeak-logging
authorKeith Packard <keithp@keithp.com>
Tue, 25 Dec 2012 22:20:42 +0000 (14:20 -0800)
committerKeith Packard <keithp@keithp.com>
Tue, 25 Dec 2012 22:20:42 +0000 (14:20 -0800)
commit868ef0c9c4b208c02a87180b0eede329369bdc77
tree1f20d312d56bac34bad12f287629a2651bbbccf8
parent669cde8a87d88ceae89e369c1d38b88c9f8198cf
parent57487e78b90465a21c87cf30deb0aeaba0887332
Merge branch 'master' into micropeak-logging
configure.ac