Index: configure.ac
==================================================================
--- configure.ac
+++ configure.ac
@@ -4,12 +4,12 @@
 AS_IF([test configure.ac -nt configure], [
 	AC_MSG_ERROR([configure.ac is newer than configure! Run autoreconf!])
 ])
 
 AC_CONFIG_SRCDIR(src)
-AC_CONFIG_AUX_DIR(build-aux)
 AC_CONFIG_MACRO_DIR(m4)
+AC_CONFIG_AUX_DIR(build-aux)
 
 AC_CANONICAL_HOST
 
 case "$host" in
 	*-msdosdjgpp*)

Index: src/resolver.m
==================================================================
--- src/resolver.m
+++ src/resolver.m
@@ -137,13 +137,13 @@
 		struct hostent *he;
 		char **ip;
 		struct sockaddr_in *addrs, *addrsIter;
 
 		/*
-		 * If the host is an IP address, don't try resolving it.  On
-		 * the Wii for example, the resolver will return an error if
-		 * you specify an IP address.
+		 * If the host is an IP address, don't try resolving it. On the
+		 * Wii for example, the resolver will return an error if you
+		 * specify an IP address.
 		 */
 		if ((s_addr = inet_addr([host UTF8String])) != INADDR_NONE) {
 			of_resolver_result_t *tmp;
 			struct sockaddr_in *addr;